From: "Peter Müller" <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7e6efc89ea167535caa29e921be0d39a9e076920
Date: Sat, 23 Apr 2022 14:21:04 +0000 [thread overview]
Message-ID: <4Kltjs27Bzz2xZm@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2611 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 7e6efc89ea167535caa29e921be0d39a9e076920 (commit)
from ab1bdf3405b2b558c4fc37e8dfcdd7149cf058d7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7e6efc89ea167535caa29e921be0d39a9e076920
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Apr 23 14:20:06 2022 +0000
dracut: Fix e2fsck call for filesystem checks
Fixes: #12842
Tested-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/dracut | 4 ++++
src/patches/dracut-059-fix-e2fsck-call.patch | 11 +++++++++++
2 files changed, 15 insertions(+)
create mode 100644 src/patches/dracut-059-fix-e2fsck-call.patch
Difference in files:
diff --git a/lfs/dracut b/lfs/dracut
index 3482ca06d..cf8cd5cb5 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 000000000..5dc0d51cd
--- /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
+
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2022-04-23 14:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4Kltjs27Bzz2xZm@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox