From ec9c666e102ba4935293b9082478a5080e70ca78 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 04 2020 00:59:13 +0000
Subject: import anaconda-33.16.3.26-2.el8_3


---

diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/0001-network-do-not-crash-on-infiniband-devices-activated.patch b/SOURCES/0001-network-do-not-crash-on-infiniband-devices-activated.patch
new file mode 100644
index 0000000..44909d4
--- /dev/null
+++ b/SOURCES/0001-network-do-not-crash-on-infiniband-devices-activated.patch
@@ -0,0 +1,40 @@
+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
+
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 81306a8..cf3242e 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 33.16.3.26
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
 
@@ -12,6 +12,8 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # make dist
 Source0: %{name}-%{version}.tar.bz2
 
+Patch1: 0001-network-do-not-crash-on-infiniband-devices-activated.patch
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -366,6 +368,11 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Thu Oct 22 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.26-2
+- network: do not crash on infiniband devices activated in initramfs
+  (rvykydal)
+  Resolves: rhbz#1890261
+
 * Tue Sep 22 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.26-1
 - Never mount partitions on a disk with the iso9660 filesystem (vponcova)
   Resolves: rhbz#1878784