diff options
| author | Ales Kozumplik <akozumpl@redhat.com> | 2011-02-21 12:32:51 +0100 |
|---|---|---|
| committer | Ales Kozumplik <akozumpl@redhat.com> | 2011-02-23 11:11:19 +0100 |
| commit | 1cdcd2a277ee4970a5521adea38a1e390a2dd295 (patch) | |
| tree | a15d3096afc7cb1674d26a25e4f9ab3fd4e993c4 | |
| parent | 74cd5280143b106d668c46bbcf7d52fd2815ff6b (diff) | |
| download | anaconda-1cdcd2a277ee4970a5521adea38a1e390a2dd295.tar.gz anaconda-1cdcd2a277ee4970a5521adea38a1e390a2dd295.tar.xz anaconda-1cdcd2a277ee4970a5521adea38a1e390a2dd295.zip | |
brcm_iscsiuio is not in Fedora yet, handle that you can't find it.
Resolves: rhbz#678675
| -rw-r--r-- | pyanaconda/storage/iscsi.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pyanaconda/storage/iscsi.py b/pyanaconda/storage/iscsi.py index ebaabe5c8..77be124c1 100644 --- a/pyanaconda/storage/iscsi.py +++ b/pyanaconda/storage/iscsi.py @@ -193,12 +193,17 @@ class iscsi(object): log.info("iSCSI startup") iutil.execWithRedirect('modprobe', ['-a'] + ISCSI_MODULES, stdout="/dev/tty5", stderr="/dev/tty5") - # this is needed by Broadcom offload cards (bnx2i) - brcm_iscsiuio = iutil.find_program_in_path('brcm_iscsiuio', + # brcm_iscsiuio is needed by Broadcom offload cards (bnx2i). Currently + # not present in iscsi-initiator-utils for Fedora. + try: + brcm_iscsiuio = iutil.find_program_in_path('brcm_iscsiuio', raise_on_error=True) - log.debug("iscsi: brcm_iscsiuio is at %s" % brcm_iscsiuio) - iutil.execWithRedirect(brcm_iscsiuio, [], - stdout="/dev/tty5", stderr="/dev/tty5") + except RuntimeError: + log.info("iscsi: brcm_iscsiuio not found.") + else: + log.debug("iscsi: brcm_iscsiuio is at %s" % brcm_iscsiuio) + iutil.execWithRedirect(brcm_iscsiuio, [], + stdout="/dev/tty5", stderr="/dev/tty5") # run the daemon iutil.execWithRedirect(ISCSID, [], stdout="/dev/tty5", stderr="/dev/tty5") |