cut_fstests: add missing dependencies

Alongside the dm-flakey and dm-snapshot modules, add a bunch of missing
fstests dependencies to the initramfs image.

Signed-off-by: David Disseldorp <ddiss@suse.de>

diff --git a/cut_fstests_cephfs.sh b/cut_fstests_cephfs.sh
index 80939c98c5dd79578924f2fcb625567d4797e2ad..47ae32ee57ac3762255d93b9bbaa43d30163357a 100755 (executable)
--- a/cut_fstests_cephfs.sh
+++ b/cut_fstests_cephfs.sh
@@ -21,13 +21,14 @@ _rt_require_fstests
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
                   strace mkfs mkfs.xfs /lib64/libkeyutils.so.1 \
-                  which perl awk bc touch cut chmod true false \
+                  which perl awk bc touch cut chmod true false unlink \
                   mktemp getfattr setfattr chacl attr killall \
                   id sort uniq date expr tac diff head dirname seq \
                   /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0 \
                   basename tee egrep hexdump sync xfs_db xfs_io \
                   fstrim fio logger dmsetup chattr lsattr cmp stat \
-                  dbench /usr/share/dbench/client.txt" \
+                  dbench /usr/share/dbench/client.txt getconf md5sum od wc \
+                  getfacl setfacl tr xargs sysctl link truncate quota" \
        --include "$FSTESTS_SRC" "/fstests" \
        --include "$CEPH_MOUNT_BIN" "/sbin/mount.ceph" \
        --include "$CEPH_CONF" "/etc/ceph/ceph.conf" \

diff --git a/cut_fstests_cifs.sh b/cut_fstests_cifs.sh
index 1b0b3cbca051ce2502b686f8ce94409e6c5698f5..3c0f488519d70b99d601399bb4bbb8ed650a0c8b 100755 (executable)
--- a/cut_fstests_cifs.sh
+++ b/cut_fstests_cifs.sh
@@ -20,13 +20,14 @@ _rt_require_fstests
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
                   strace mkfs mkfs.xfs /lib64/libkeyutils.so.1 \
-                  which perl awk bc touch cut chmod true false \
+                  which perl awk bc touch cut chmod true false unlink \
                   mktemp getfattr setfattr chacl attr killall \
                   id sort uniq date expr tac diff head dirname seq \
                   /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0 \
                   basename tee egrep hexdump sync xfs_db xfs_io mount.cifs \
                   fstrim fio logger dmsetup chattr lsattr cmp stat \
-                  dbench /usr/share/dbench/client.txt" \
+                  dbench /usr/share/dbench/client.txt getconf md5sum od wc \
+                  getfacl setfacl tr xargs sysctl link truncate quota" \
        --include "$FSTESTS_SRC" "/fstests" \
        --include "$RAPIDO_DIR/fstests_cifs_autorun.sh" "/.profile" \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \

diff --git a/cut_fstests_local.sh b/cut_fstests_local.sh
index 0ae6268d7c607e1a5253d6791deb7ecfc42fc469..c77f5f5505ba94f7e0b0061c25894de65ca85029 100755 (executable)
--- a/cut_fstests_local.sh
+++ b/cut_fstests_local.sh
@@ -20,19 +20,20 @@ _rt_require_fstests
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
                   strace mkfs mkfs.btrfs mkfs.xfs /lib64/libkeyutils.so.1 \
-                  which perl awk bc touch cut chmod true false \
-                  mktemp getfattr setfattr chacl attr killall \
+                  which perl awk bc touch cut chmod true false unlink \
+                  mktemp getfattr setfattr chacl attr killall hexdump sync \
                   id sort uniq date expr tac diff head dirname seq \
                   /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0 \
-                  basename tee egrep hexdump sync xfs_db xfs_io \
-                  xfs_logprint xfs_repair xfs_growfs \
+                  basename tee egrep xfs_freeze xfs_db xfs_io xfs_info \
+                  xfs_logprint xfs_repair xfs_growfs xfs_quota xfs_bmap \
                   fstrim fio logger dmsetup chattr lsattr cmp stat \
-                  dbench /usr/share/dbench/client.txt hostname" \
+                  dbench /usr/share/dbench/client.txt hostname getconf md5sum \
+                  od wc getfacl setfacl tr xargs sysctl link truncate quota" \
        --include "$FSTESTS_SRC" "/fstests" \
        --include "$RAPIDO_DIR/fstests_local_autorun.sh" "/.profile" \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \
        --include "$RAPIDO_DIR/vm_autorun.env" "/vm_autorun.env" \
-       --add-drivers "zram lzo" \
+       --add-drivers "zram lzo dm-snapshot dm-flakey" \
        --modules "bash base" \
        $DRACUT_EXTRA_ARGS \
        $DRACUT_OUT || _fail "dracut failed"