import dracut-049-135.git20210121.el8

SOURCES/0132.patch

@@ -27,3 +27,4 @@ index c32feeed..444c943e 100755
  fi
  
  # Note lldpad will stay running after switchroot, the system initscripts
+

SOURCES/0133.patch

@@ -0,0 +1,27 @@
+From 6297e8accadcddcdd390f4e0583f9bde29f3758e Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Thu, 7 Nov 2019 14:03:23 +0100
+Subject: [PATCH] spec: dracut-network is happy with either NM or dhclient
+
+(cherry picked from commit e8638076857621b28eb4dc36cdd49a94992835b7)
+
+Resolves: #1916174
+---
+ dracut.spec | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dracut.spec b/dracut.spec
+index b371118e..fa3e4b99 100644
+--- a/dracut.spec
++++ b/dracut.spec
+@@ -125,7 +125,8 @@ Requires: %{name} = %{version}-%{release}
+ %endif
+ Requires: iputils
+ Requires: iproute
+-Requires: dhclient
++Requires: (NetworkManager >= 1.20 or dhclient)
++Suggests: NetworkManager
+ Obsoletes: dracut-generic < 008
+ Provides:  dracut-generic = %{version}-%{release}
+ 
+

SOURCES/0134.patch

@@ -0,0 +1,42 @@
+From db5fda123c2960e99cb29399bdedbd56d672c72d Mon Sep 17 00:00:00 2001
+From: Thomas Blume <Thomas.Blume@suse.com>
+Date: Mon, 24 Feb 2020 12:11:25 +0100
+Subject: [PATCH] 95fcoe: default rd.nofcoe to false
+
+rd.nofcoe should default to false, e.g. fcoe should be enabled unless
+overwritten from the command line.
+The same applies for lldapd.sh.
+
+(cherry picked from commit 8446c8f9deefcc6c47d96a128b1e9b23d8855a96)
+
+Resolves: #1885621
+---
+ modules.d/95fcoe/lldpad.sh     | 2 +-
+ modules.d/95fcoe/parse-fcoe.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/95fcoe/lldpad.sh b/modules.d/95fcoe/lldpad.sh
+index 444c943e..7faa2e19 100755
+--- a/modules.d/95fcoe/lldpad.sh
++++ b/modules.d/95fcoe/lldpad.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ 
+-if ! getargbool 0 rd.nofcoe ; then
++if getargbool 0 rd.nofcoe ; then
+ 	info "rd.nofcoe=0: skipping lldpad activation"
+ 	return 0
+ fi
+diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh
+index 8bb55c6e..86f4331e 100755
+--- a/modules.d/95fcoe/parse-fcoe.sh
++++ b/modules.d/95fcoe/parse-fcoe.sh
+@@ -13,7 +13,7 @@
+ # fcoe=eth0:nodcb:vn2vn
+ # fcoe=4a:3f:4c:04:f8:d7:nodcb:fabric
+ 
+-if ! getargbool 0 rd.nofcoe ; then
++if getargbool 0 rd.nofcoe ; then
+ 	info "rd.nofcoe=0: skipping fcoe"
+ 	return 0
+ fi

SPECS/dracut.spec

@@ -5,7 +5,7 @@
 # strip the automatically generated dep here and instead co-own the
 # directory.
 %global __requires_exclude pkg-config
-%define dist_free_release 133.git20210112
+%define dist_free_release 135.git20210121
 
 Name: dracut
 Version: 049
@@ -160,6 +160,8 @@ Patch129: 0129.patch
 Patch130: 0130.patch
 Patch131: 0131.patch
 Patch132: 0132.patch
+Patch133: 0133.patch
+Patch134: 0134.patch
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 
@@ -258,7 +260,8 @@ Requires: %{name} = %{version}-%{release}
 %endif
 Requires: iputils
 Requires: iproute
-Requires: dhclient
+Requires: (NetworkManager >= 1.20 or dhclient)
+Suggests: NetworkManager
 Obsoletes: dracut-generic < 008
 Provides:  dracut-generic = %{version}-%{release}
 
@@ -622,6 +625,12 @@ echo '# Since rhel-8.3 dracut moved to use NetworkManager
 add_dracutmodules+=" network-legacy "' > /etc/dracut.conf.d/50-network-legacy.conf
 
 %changelog
+* Thu Jan 21 2021 Lukas Nykryn <lnykryn@redhat.com> - 049-135.git20210121
+- 95fcoe: default rd.nofcoe to false
+
+* Thu Jan 14 2021 Lukas Nykryn <lnykryn@redhat.com> - 049-134.git20210114
+- spec: dracut-network is happy with either NM or dhclient
+
 * Tue Jan 12 2021 Lukas Nykryn <lnykryn@redhat.com> - 049-133.git20210112
 - 95fcoe: Fix startup when fcoe module is included
 - Fix pre-trigger stage by replacing exit with return in