Write out NM_CONTROLLED=no for NICs used for FCoE, note that unlike with
iSCSI we do not blindly write out NM_CONTROLLED=no for all NICs, but just
for the NIC which is used for FCoE.
The iSCSI behaviour is undesirable, but the whole writing of NM_CONTROLLED=no
for iSCSI will go away as soon as NetworkManager is fixed to not down
devices when it takes over control, which should be fixed soon.
---
network.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/network.py b/network.py
index e3ce2c1..b4a8c89 100644
--- a/network.py
+++ b/network.py
@@ -587,8 +587,9 @@ class Network:
# FIXME: use device.host_address to only add "NM_CONTROLLED=no"
# for interfaces actually used enroute to the device
for d in anaconda.id.storage.devices:
- if rootdev.dependsOn(d) and isinstance(d,
- storage.devices.NetworkStorageDevice):
+ if rootdev.dependsOn(d) and \
+ isinstance(d, storage.devices.NetworkStorageDevice) and\
+ (not d.nic or d.nic == device):
f.write("NM_CONTROLLED=no\n")
break
--
1.6.2.2
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
