From: Peter Müller Date: Sat, 23 Apr 2022 14:20:06 +0000 (+0000) Subject: dracut: Fix e2fsck call for filesystem checks X-Git-Tag: v2.27-core167^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e6efc89ea167535caa29e921be0d39a9e076920;p=ipfire-2.x.git dracut: Fix e2fsck call for filesystem checks Fixes: #12842 Tested-by: Peter Müller Signed-off-by: Peter Müller --- diff --git a/lfs/dracut b/lfs/dracut index 3482ca06dc..cf8cd5cb56 100644 --- a/lfs/dracut +++ b/lfs/dracut @@ -70,6 +70,10 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + # https://bugzilla.ipfire.org/show_bug.cgi?id=12842 + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-059-fix-e2fsck-call.patch + cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install sbindir=/sbin sysconfdir=/etc diff --git a/src/patches/dracut-059-fix-e2fsck-call.patch b/src/patches/dracut-059-fix-e2fsck-call.patch new file mode 100644 index 0000000000..5dc0d51cd9 --- /dev/null +++ b/src/patches/dracut-059-fix-e2fsck-call.patch @@ -0,0 +1,11 @@ +--- dracut-056.orig/modules.d/99fs-lib/fs-lib.sh 2022-04-23 09:50:21.617018447 +0000 ++++ dracut-056/modules.d/99fs-lib/fs-lib.sh 2022-04-23 09:50:35.750018142 +0000 +@@ -107,7 +107,7 @@ + + info "issuing $_drv $_fop $_dev" + # we enforce non-interactive run, so $() is fine +- _out=$($_drv "$_fop" "$_dev") ++ _out=$($_drv $_fop "$_dev") + _ret=$? + fsck_tail +