[PATCH rhel7-branch 6/6] network: Catch exception from NM failing to create a bridge device (#1075195)

Radek Vykydal rvykydal at redhat.com
Thu Sep 25 11:30:35 UTC 2014


Related: rhbz#1075195
---
 pyanaconda/network.py | 6 +++---
 pyanaconda/nm.py      | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index d63d8c3..a7c8e6f 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -1224,9 +1224,9 @@ def apply_kickstart(ksdata):
             for con_uuid, dev_name in added_connections:
                 try:
                     nm.nm_activate_device_connection(dev_name, con_uuid)
-                except nm.UnknownConnectionError:
-                    log.warning("network: pre kickstart: can't activate connection %s on %s",
-                                con_uuid, dev_name)
+                except (nm.UnknownConnectionError, nm.UnknownDeviceError) as e:
+                    log.warning("network: pre kickstart: can't activate connection %s on %s: %s",
+                                con_uuid, dev_name, e)
     return applied_devices
 
 def networkInitialize(ksdata):
diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py
index fdf2a1e..ed25d90 100644
--- a/pyanaconda/nm.py
+++ b/pyanaconda/nm.py
@@ -710,6 +710,8 @@ def nm_activate_device_connection(dev_name, con_uuid):
             raise UnmanagedDeviceError(dev_name, e)
         elif "org.freedesktop.NetworkManager.UnknownConnection" in e.message:
             raise UnknownConnectionError(dev_name, e)
+        if "org.freedesktop.NetworkManager.UnknownDevice" in e.message:
+            raise UnknownDeviceError(dev_name, e)
         raise
 
 def nm_add_connection(values):
-- 
1.9.3



More information about the anaconda-patches mailing list