dracut: Fix e2fsck call for filesystem checks

Fixes: #12842

Tested-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
This commit is contained in:
Peter Müller
2022-04-23 14:20:06 +00:00
parent ab1bdf3405
commit 7e6efc89ea
2 changed files with 15 additions and 0 deletions

View File

@@ -70,6 +70,10 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) @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) && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install sbindir=/sbin sysconfdir=/etc cd $(DIR_APP) && make install sbindir=/sbin sysconfdir=/etc

View File

@@ -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