diff options
| author | Radek Vykydal <rvykydal@redhat.com> | 2012-08-06 12:35:15 +0200 |
|---|---|---|
| committer | Radek Vykydal <rvykydal@redhat.com> | 2012-08-08 14:15:21 +0200 |
| commit | 6d93d0f049dcecd5acd6f9a9142d951ac1b73dde (patch) | |
| tree | bf8a651b66e9e270afa7668762e7f236de251854 | |
| parent | 6dd8e5c8540c8aae6633193bedbe7a61d845cc06 (diff) | |
| download | anaconda-6d93d0f049dcecd5acd6f9a9142d951ac1b73dde.tar.gz anaconda-6d93d0f049dcecd5acd6f9a9142d951ac1b73dde.tar.xz anaconda-6d93d0f049dcecd5acd6f9a9142d951ac1b73dde.zip | |
A little fix of newui -> master merge (iscsi offload devices)
| -rw-r--r-- | pyanaconda/network.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 22025ff51..0f38b5ee6 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: |