neil / rpms / anaconda

Forked from rpms/anaconda a year ago
Clone
Blob Blame History Raw
From 5994e5ab09719656ca09a279e5b38f1ce3184d8d Mon Sep 17 00:00:00 2001
From: Radek Vykydal <rvykydal@redhat.com>
Date: Wed, 26 Aug 2020 09:52:24 +0200
Subject: [PATCH] network: do not crash on infiniband devices activated in
 initramfs

Resolves: rhbz#1890009
---
 pyanaconda/modules/network/initialization.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pyanaconda/modules/network/initialization.py b/pyanaconda/modules/network/initialization.py
index 5e33d0494..b27a46976 100644
--- a/pyanaconda/modules/network/initialization.py
+++ b/pyanaconda/modules/network/initialization.py
@@ -411,13 +411,14 @@ class DumpMissingIfcfgFilesTask(Task):
         s_con.set_property(NM.SETTING_CONNECTION_ID, iface)
         s_con.set_property(NM.SETTING_CONNECTION_INTERFACE_NAME, iface)
         s_wired = con.get_setting_wired()
-        # By default connections are bound to interface name
-        s_wired.set_property(NM.SETTING_WIRED_MAC_ADDRESS, None)
-        bound_mac = bound_hwaddr_of_device(self._nm_client, iface, self._ifname_option_values)
-        if bound_mac:
-            s_wired.set_property(NM.SETTING_WIRED_MAC_ADDRESS, bound_mac)
-            log.debug("%s: iface %s bound to mac address %s by ifname boot option",
-                      self.name, iface, bound_mac)
+        if s_wired:
+            # By default connections are bound to interface name
+            s_wired.set_property(NM.SETTING_WIRED_MAC_ADDRESS, None)
+            bound_mac = bound_hwaddr_of_device(self._nm_client, iface, self._ifname_option_values)
+            if bound_mac:
+                s_wired.set_property(NM.SETTING_WIRED_MAC_ADDRESS, bound_mac)
+                log.debug("%s: iface %s bound to mac address %s by ifname boot option",
+                          self.name, iface, bound_mac)
 
     @guard_by_system_configuration(return_value=[])
     def run(self):
-- 
2.21.1