Merge branch 'master' into f32

0001-Fix-pre-trigger-stage-by-replacing-exit-with-return-.patch

@@ -0,0 +1,28 @@
+From 7fb8f939a52a904b1860e303a6a7fe69ba0d2ceb 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.
+---
+ 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
+-- 
+2.25.1
+

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 1
+%define dist_free_release 2
 
 Name: dracut
 Version: 050
@@ -31,6 +31,10 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 
+# Fix pre-trigger stage by replacing exit with return in lldpad.sh
+# https://github.com/dracutdevs/dracut/pull/754
+Patch0: 0001-Fix-pre-trigger-stage-by-replacing-exit-with-return-.patch
+
 BuildRequires: bash
 BuildRequires: git
 BuildRequires: pkgconfig(libkmod) >= 23
@@ -482,6 +486,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
 %endif
 
 %changelog
+* Tue Mar 10 2020 Adam Williamson <awilliam@redhat.com> - 050-2
+- Backport fix for pre-trigger stage early exit from upstream (#1811070)
+
 * Wed Mar 04 2020 Harald Hoyer <harald@redhat.com> - 050-1
 - version 050