Re: [PATCH rhel6-branch] Wait only for activation of devices controlled by NM (#598432)

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

 



Ack.

On 06/02/2010 03:22 PM, Radek Vykydal wrote:
---
  gui.py     |    2 +-
  network.py |    5 +++--
  2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gui.py b/gui.py
index 88942d3..5d6a9fc 100755
--- a/gui.py
+++ b/gui.py
@@ -990,7 +990,7 @@ class InstallInterface(InstallInterfaceBase):
              self.anaconda.id.network.update()

              if just_setup:
-                waited_devs = self.anaconda.id.network.getOnbootIfaces()
+                waited_devs = self.anaconda.id.network.getOnbootControlledIfaces()
              else:
                  waited_devs = [install_device]

diff --git a/network.py b/network.py
index 7ed5143..3d5a365 100644
--- a/network.py
+++ b/network.py
@@ -434,10 +434,11 @@ class Network:
              else:
                  device.set(('ONBOOT', 'yes'))

-    def getOnbootIfaces(self):
+    def getOnbootControlledIfaces(self):
          ifaces = []
          for iface, device in self.netdevices.items():
-            if device.get('ONBOOT') == "yes":
+            if (device.get('ONBOOT') == "yes" and
+                device.get('NM_CONTROLLED' == "yes")):
                  ifaces.append(iface)
          return ifaces


_______________________________________________
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