diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2009-07-09 15:47:12 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2009-07-09 15:47:12 +0200 |
| commit | 91e3b49205eca4af3ac80312beebdc78d3e70116 (patch) | |
| tree | 93c092eab70766b3930ebc4175424fa8e4f82be1 /network.py | |
| parent | 612ec7a3417680fed659e8e7bc216b2870bd1488 (diff) | |
| download | anaconda-91e3b49205eca4af3ac80312beebdc78d3e70116.tar.gz anaconda-91e3b49205eca4af3ac80312beebdc78d3e70116.tar.xz anaconda-91e3b49205eca4af3ac80312beebdc78d3e70116.zip | |
Write out NM_CONTROLLED=no for NICs used for FCoE
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.
Diffstat (limited to 'network.py')
| -rw-r--r-- | network.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/network.py b/network.py index 1c06fb6b8..f597c9d7c 100644 --- a/network.py +++ b/network.py @@ -586,8 +586,8 @@ 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 isinstance(d, storage.devices.NetworkStorageDevice) and\ + (rootdev.dependsOn(d) or d.nic == device): f.write("NM_CONTROLLED=no\n") break |