feat(debug): add findmnt to help debugging

Also sorted the list.

diff --git a/modules.d/95debug/module-setup.sh b/modules.d/95debug/module-setup.sh
index 3124f1af33304aee5a6e9823756748bee886579d..b21148ac0b03b77854f244dc1c7c32b1437beb49 100755 (executable)
--- a/modules.d/95debug/module-setup.sh
+++ b/modules.d/95debug/module-setup.sh
@@ -13,10 +13,44 @@ depends() {
 
 # called by dracut
 install() {
-    inst_multiple -o ls ps grep more cat rm strace free showmount df du lsblk \
-        ping netstat rpcinfo vi scp ping6 ssh find chroot \
-        tcpdump cp dd less hostname mkdir systemd-analyze \
-        fsck fsck.ext2 fsck.ext4 fsck.ext3 fsck.ext4dev fsck.f2fs fsck.vfat e2fsck
+    inst_multiple -o \
+        cat \
+        chroot \
+        cp \
+        dd \
+        df \
+        du \
+        e2fsck \
+        findmnt \
+        find \
+        free \
+        fsck \
+        fsck.ext2 \
+        fsck.ext3 \
+        fsck.ext4 \
+        fsck.ext4dev \
+        fsck.f2fs \
+        fsck.vfat \
+        grep \
+        hostname \
+        less \
+        ls \
+        lsblk \
+        mkdir \
+        more \
+        netstat \
+        ping \
+        ping6 \
+        ps \
+        rm \
+        rpcinfo \
+        scp \
+        showmount \
+        ssh \
+        strace \
+        systemd-analyze \
+        tcpdump \
+        vi
 
     grep '^tcpdump:' "$dracutsysrootdir"/etc/passwd 2> /dev/null >> "$initdir/etc/passwd"
 }

diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index fba9b5d0453cd49f390c99f0829bb6de4afade3e..c53de31988bf901ef4d981d5331a06f8fad4fa8f 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -60,7 +60,6 @@ test_setup() {
         -m "test-root systemd-ldconfig" \
         -i "${PKGLIBDIR}/modules.d/80test-root/test-init.sh" "/sbin/test-init.sh" \
         -i ./test-init.sh /sbin/test-init \
-        -I "findmnt" \
         -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1
 
     mkdir -p "$TESTDIR"/overlay/source && cp -a "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* && export initdir=$TESTDIR/overlay/source