[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [master] brcm_iscsiuio is not in Fedora yet, handle that you can't find it.



ack

On Mon, 2011-02-21 at 12:34 +0100, Ales Kozumplik wrote:
> Resolves: rhbz#678675
> ---
>  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 ebaabe5..77be124 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")

-- 
Martin Gracik <mgracik redhat com>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]