52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
|
From 3cb964855f508e8aabc91c297d9efc0cab766b0c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Philipp Rudo <prudo@redhat.com>
|
||
|
|
Date: Tue, 13 Aug 2024 16:23:26 +0200
|
||
|
|
Subject: [PATCH 07/16] 99zz-fadumpinit: fix shellcheck warnings
|
||
|
|
|
||
|
|
Fix the shellcheck warnings for 99zz-fadumpinit. With this
|
||
|
|
|
||
|
|
$ shellcheck -x dracut/99zz-fadumpinit/*.sh
|
||
|
|
|
||
|
|
now returns without finding.
|
||
|
|
|
||
|
|
Signed-off-by: Philipp Rudo <prudo@redhat.com>
|
||
|
|
---
|
||
|
|
dracut/99zz-fadumpinit/init-fadump.sh | 6 ++----
|
||
|
|
dracut/99zz-fadumpinit/module-setup.sh | 2 ++
|
||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/dracut/99zz-fadumpinit/init-fadump.sh b/dracut/99zz-fadumpinit/init-fadump.sh
|
||
|
|
index 933afc0..911cf9e 100755
|
||
|
|
--- a/dracut/99zz-fadumpinit/init-fadump.sh
|
||
|
|
+++ b/dracut/99zz-fadumpinit/init-fadump.sh
|
||
|
|
@@ -14,10 +14,8 @@ if [ -f /proc/device-tree/rtas/ibm,kernel-dump ] || [ -f /proc/device-tree/ibm,o
|
||
|
|
mkdir /newroot
|
||
|
|
mount -t ramfs ramfs /newroot
|
||
|
|
|
||
|
|
- if [ $ROOTFS_IS_RAMFS ]; then
|
||
|
|
- for FILE in $(ls -A /fadumproot/); do
|
||
|
|
- mv /fadumproot/$FILE /newroot/
|
||
|
|
- done
|
||
|
|
+ if [ "$ROOTFS_IS_RAMFS" ]; then
|
||
|
|
+ mv /fadumproot/* /newroot/
|
||
|
|
exec switch_root /newroot /init
|
||
|
|
else
|
||
|
|
mkdir /newroot/sys /newroot/proc /newroot/dev /newroot/run /newroot/oldroot
|
||
|
|
diff --git a/dracut/99zz-fadumpinit/module-setup.sh b/dracut/99zz-fadumpinit/module-setup.sh
|
||
|
|
index f062486..8fa5e16 100755
|
||
|
|
--- a/dracut/99zz-fadumpinit/module-setup.sh
|
||
|
|
+++ b/dracut/99zz-fadumpinit/module-setup.sh
|
||
|
|
@@ -9,7 +9,9 @@ depends() {
|
||
|
|
}
|
||
|
|
|
||
|
|
install() {
|
||
|
|
+ # shellcheck disable=SC2154
|
||
|
|
mv -f "$initdir/init" "$initdir/init.dracut"
|
||
|
|
+ # shellcheck disable=SC2154
|
||
|
|
inst_script "$moddir/init-fadump.sh" /init
|
||
|
|
chmod a+x "$initdir/init"
|
||
|
|
|
||
|
|
--
|
||
|
|
2.46.1
|
||
|
|
|