[PATCH rhel6-branch] Disable NM for iface used by root on iscsi (#500273)

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

 



Additional fix of patchset for the bug. Fixes #805541 marked as
duplicate of the referred bug.

Related: rhbz#500273
---
 network.py |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/network.py b/network.py
index 8940534..ac6a901 100644
--- a/network.py
+++ b/network.py
@@ -290,14 +290,12 @@ class NetworkDevice(IfcfgFile):
         for d in anaconda.id.storage.devices:
             if (isinstance(d, storage.devices.iScsiDiskDevice) and
                 rootdev.dependsOn(d)):
-                # device is bound to nic
-                if d.nic:
-                    if self.iface == d.nic:
-                        return True
-                # device is using default interface
-                else:
+                if d.nic == "default":
                     if self.iface == ifaceForHostIP(d.host_address):
                         return True
+                elif d.nic == self.iface:
+                    return True
+
         return False
 
 class Network:
-- 
1.7.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux