From 05f85fd27ebdbe770e0abac4201af7cba4756c4a Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Fri, 7 Apr 2023 16:50:12 -0500 Subject: [PATCH] dracut: backport e2fsck invocation fix Closes: #43332 [via git-merge-pr] --- srcpkgs/dracut/patches/fix-fsck.patch | 27 +++++++++++++++++++++++++++ srcpkgs/dracut/template | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/dracut/patches/fix-fsck.patch diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch new file mode 100644 index 00000000000..97c72d05e55 --- /dev/null +++ b/srcpkgs/dracut/patches/fix-fsck.patch @@ -0,0 +1,27 @@ +https://github.com/dracutdevs/dracut/pull/2262 + +From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001 +From: Laszlo Gombos +Date: Sat, 4 Mar 2023 23:28:17 +0000 +Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the + e2fsck call + +Fix regression. +--- + modules.d/99fs-lib/fs-lib.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh +index dd20731f2..c4640fa8a 100755 +--- a/modules.d/99fs-lib/fs-lib.sh ++++ b/modules.d/99fs-lib/fs-lib.sh +@@ -107,7 +107,8 @@ fsck_drv_com() { + + info "issuing $_drv $_fop $_dev" + # we enforce non-interactive run, so $() is fine +- _out=$($_drv "$_fop" "$_dev") ++ # shellcheck disable=SC2086 ++ _out=$($_drv $_fop "$_dev") + _ret=$? + fsck_tail + diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 52a0c38c91c..859d7a2c907 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut version=059 -revision=2 +revision=3 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" conf_files="/etc/dracut.conf"