[PR PATCH] dracut: backport e2fsck invocation fix

[PR PATCH] dracut: backport e2fsck invocation fix

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

There is a new pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages master
https://github.com/void-linux/void-packages/pull/43332

dracut: backport e2fsck invocation fix
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

A patch file from https://github.com/void-linux/void-packages/pull/43332.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-43332.patch --]
[-- Type: text/x-diff, Size: 1843 bytes --]

From bd1c16b7d9261bbcce131ea1fd083b8cc12ff789 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 7 Apr 2023 16:50:12 -0500
Subject: [PATCH] dracut: backport e2fsck invocation fix

---
 srcpkgs/dracut/patches/fix-fsck.patch | 25 +++++++++++++++++++++++++
 srcpkgs/dracut/template               |  2 +-
 2 files changed, 26 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 000000000000..8e9043b768a4
--- /dev/null
+++ b/srcpkgs/dracut/patches/fix-fsck.patch
@@ -0,0 +1,25 @@
+From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
+From: Laszlo Gombos <laszlo.gombos@gmail.com>
+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 52a0c38c91c8..859d7a2c907f 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"

Re: dracut: backport e2fsck invocation fix

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/43332#issuecomment-1500732910

Comment:
Tested, confirmed working!

Re: [PR PATCH] [Closed]: dracut: backport e2fsck invocation fix

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

There's a closed pull request on the void-packages repository

dracut: backport e2fsck invocation fix
https://github.com/void-linux/void-packages/pull/43332

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**