summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-05-15 10:07:12 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-05-15 10:07:12 +0100
commite7ec27c2c868e9a34994eb002440281c597356af (patch)
tree3b69c97bfa1115ef2d4afa797c1a913cd3573650
parent5bbbd1bf841cf5b6343fce5a8f0db4c1cdad2040 (diff)
sys-kernel/dracut : fix bash 5 issues
-rw-r--r--sys-kernel/dracut/dracut-048-r5.ebuild (renamed from sys-kernel/dracut/dracut-048-r4.ebuild)1
-rw-r--r--sys-kernel/dracut/files/fix-bash-5.patch57
2 files changed, 58 insertions, 0 deletions
diff --git a/sys-kernel/dracut/dracut-048-r4.ebuild b/sys-kernel/dracut/dracut-048-r5.ebuild
index 44778fb3..563cc218 100644
--- a/sys-kernel/dracut/dracut-048-r4.ebuild
+++ b/sys-kernel/dracut/dracut-048-r5.ebuild
@@ -75,6 +75,7 @@ PATCHES=(
"${FILESDIR}"/048-redcore-change-default-initramfs-name.patch
"${FILESDIR}"/048-remove_JobRunningTimeoutSec.patch
"${FILESDIR}"/048-sort-fixup-creating-early-microcode.patch
+ "${FILESDIR}"/fix-bash-5.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/fix-bash-5.patch b/sys-kernel/dracut/files/fix-bash-5.patch
new file mode 100644
index 00000000..1f8f29cb
--- /dev/null
+++ b/sys-kernel/dracut/files/fix-bash-5.patch
@@ -0,0 +1,57 @@
+diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
+index d39ca1b7..8dbc8b3c 100755
+--- ./modules.d/99fs-lib/fs-lib.sh
++++ ./modules.d/99fs-lib/fs-lib.sh
+@@ -44,22 +44,22 @@ fsck_able() {
+ ;;
+ ext?)
+ type e2fsck >/dev/null 2>&1 &&
+- _drv="_drv=e2fsck fsck_drv_com" &&
++ _drv="_drv=e2fsck fsck_drv_com e2fsck" &&
+ return 0
+ ;;
+ f2fs)
+ type fsck.f2fs >/dev/null 2>&1 &&
+- _drv="_drv=fsck.f2fs fsck_drv_com" &&
++ _drv="_drv=fsck.f2fs fsck_drv_com fsck.f2fs" &&
+ return 0
+ ;;
+ jfs)
+ type jfs_fsck >/dev/null 2>&1 &&
+- _drv="_drv=jfs_fsck fsck_drv_com" &&
++ _drv="_drv=jfs_fsck fsck_drv_com jfs_fsck" &&
+ return 0
+ ;;
+ reiserfs)
+ type reiserfsck >/dev/null 2>&1 &&
+- _drv="_drv=reiserfsck fsck_drv_com" &&
++ _drv="_drv=reiserfsck fsck_drv_com reiserfsck" &&
+ return 0
+ ;;
+ btrfs)
+@@ -75,7 +75,7 @@ fsck_able() {
+ ;;
+ *)
+ type fsck >/dev/null 2>&1 &&
+- _drv="_drv=fsck fsck_drv_std" &&
++ _drv="_drv=fsck fsck_drv_std fsck" &&
+ return 0
+ ;;
+ esac
+@@ -99,6 +99,7 @@ fsck_drv_btrfs() {
+ fsck_drv_com() {
+ local _ret
+ local _out
++ local _drv=$1
+
+ if ! strglobin "$_fop" "-[ynap]"; then
+ _fop="-a ${_fop}"
+@@ -177,7 +178,7 @@ fsck_batch() {
+ _out="$(fsck -M -T "$@" -- -a)"
+ _ret=$?
+
+- fsck_tail
++ _drv=$_drv fsck_tail
+
+ return $_ret
+ }