[PATCH master] A little fix of newui -> master merge (iscsi offload devices)

Vratislav Podzimek vpodzime at redhat.com
Wed Aug 8 11:34:43 UTC 2012


Looks good to me.

On Wed, 2012-08-08 at 12:56 +0200, Radek Vykydal wrote:
> ---
>  pyanaconda/network.py |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/pyanaconda/network.py b/pyanaconda/network.py
> index 22025ff..0f38b5e 100644
> --- a/pyanaconda/network.py
> +++ b/pyanaconda/network.py
> @@ -477,7 +477,7 @@ def waitForConnection():
>  # get a kernel cmdline string for dracut needed for access to storage host
>  def dracutSetupArgs(networkStorageDevice):
>  
> -    if networkStorageDevice.nic == "default":
> +    if networkStorageDevice.nic == "default" or ":" in networkStorageDevice.nic:
>          nic = ifaceForHostIP(networkStorageDevice.host_address)
>          if not nic:
>              return ""
> @@ -885,7 +885,7 @@ def usedByRootOnISCSI(iface, storage):
>      for d in storage.devices:
>          if (isinstance(d, iScsiDiskDevice) and
>              rootdev.dependsOn(d)):
> -            if d.nic == "default":
> +            if d.nic == "default" or ":" in d.nic:
>                  if iface == ifaceForHostIP(d.host_address):
>                      return True
>              elif d.nic == iface:

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list