From 9322d7a4079acfaf96c32ab32c44ac92e9c6ff84 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 15 2021 08:08:33 +0000
Subject: import dracut-049-133.git20210112.el8


---

diff --git a/SOURCES/0130.patch b/SOURCES/0130.patch
index c1033de..09f5e1b 100644
--- a/SOURCES/0130.patch
+++ b/SOURCES/0130.patch
@@ -43,3 +43,4 @@ index 5ac34ef3..47eb8e7d 100755
              sed -i 's/'$KERNEL_VERSION'/0-rescue-'${MACHINE_ID}'/' $LOADER_ENTRY
          fi
  
+
diff --git a/SOURCES/0131.patch b/SOURCES/0131.patch
new file mode 100644
index 0000000..c7946e6
--- /dev/null
+++ b/SOURCES/0131.patch
@@ -0,0 +1,31 @@
+From 1651c3074f596b80478473a126c02c27398429dd Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Thu, 18 Jul 2019 11:29:29 +0200
+Subject: [PATCH] 95fcoe: Fix startup when fcoe module is included
+
+The parse-fcoe.sh hook is sourced, and hence must not contain
+exit 0 calls. Otherwise, the cmdline sequence will be interupted,
+and no error will be reported to systemd. Use return instead.
+
+Reference: boo#1136977
+(cherry picked from commit 4f194276417237168f5bc929ba847a23b6a4c77f)
+
+Resolves: #1914957
+---
+ modules.d/95fcoe/parse-fcoe.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh
+index 7a6ff755..8bb55c6e 100755
+--- a/modules.d/95fcoe/parse-fcoe.sh
++++ b/modules.d/95fcoe/parse-fcoe.sh
+@@ -15,7 +15,7 @@
+ 
+ if ! getargbool 0 rd.nofcoe ; then
+ 	info "rd.nofcoe=0: skipping fcoe"
+-	exit 0
++	return 0
+ fi
+ 
+ [ -z "$fcoe" ] && fcoe=$(getarg fcoe=)
+
diff --git a/SOURCES/0132.patch b/SOURCES/0132.patch
new file mode 100644
index 0000000..e53f35a
--- /dev/null
+++ b/SOURCES/0132.patch
@@ -0,0 +1,29 @@
+From e96bab3e688b7fc9b6f5e6b90c6d1ea4d517bc4a Mon Sep 17 00:00:00 2001
+From: Radek Vykydal <rvykydal@redhat.com>
+Date: Tue, 10 Mar 2020 10:48:21 +0100
+Subject: [PATCH] Fix pre-trigger stage by replacing exit with return in
+ lldpad.sh
+
+Using exit makes the pre-trigger stage finish after running 03-lldpad.sh
+pre-trigger hook.
+
+(cherry picked from commit 7fb8f939a52a904b1860e303a6a7fe69ba0d2ceb)
+
+Resolves: #1914957
+---
+ modules.d/95fcoe/lldpad.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/95fcoe/lldpad.sh b/modules.d/95fcoe/lldpad.sh
+index c32feeed..444c943e 100755
+--- a/modules.d/95fcoe/lldpad.sh
++++ b/modules.d/95fcoe/lldpad.sh
+@@ -2,7 +2,7 @@
+ 
+ if ! getargbool 0 rd.nofcoe ; then
+ 	info "rd.nofcoe=0: skipping lldpad activation"
+-	exit 0
++	return 0
+ fi
+ 
+ # Note lldpad will stay running after switchroot, the system initscripts
diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec
index 1d9a85e..0596b6d 100644
--- a/SPECS/dracut.spec
+++ b/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 131.git20210107
+%define dist_free_release 133.git20210112
 
 Name: dracut
 Version: 049
@@ -158,6 +158,8 @@ Patch127: 0127.patch
 Patch128: 0128.patch
 Patch129: 0129.patch
 Patch130: 0130.patch
+Patch131: 0131.patch
+Patch132: 0132.patch
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 
@@ -620,6 +622,10 @@ echo '# Since rhel-8.3 dracut moved to use NetworkManager
 add_dracutmodules+=" network-legacy "' > /etc/dracut.conf.d/50-network-legacy.conf
 
 %changelog
+* 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
+
 * Thu Jan 07 2021 Lukas Nykryn <lnykryn@redhat.com> - 049-131.git20210107
 - 00systemd: when putting systemd-vconsole-setup.service as a
 - 51-dracut-rescue.install: Don't use BLS fragment shipped by