cut: indicate networklessness

blktests_zram, fstests_local and qemu_rbd do not require a network
connection within the VM, so indicate as such. Additionally, remove the
unneeded network and ifcfg modules.

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

diff --git a/cut_blktests_zram.sh b/cut_blktests_zram.sh
index e4bf051251ffeff0b1c930635d1740fe21ace1d2..8c82da2dacfd5db7bb607225dde1a1ad2f0240b9 100755 (executable)
--- a/cut_blktests_zram.sh
+++ b/cut_blktests_zram.sh
@@ -28,6 +28,8 @@ dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \
        --include "$RAPIDO_DIR/vm_autorun.env" "/vm_autorun.env" \
        --add-drivers "zram lzo scsi_debug null_blk loop" \
-       --modules "bash base network ifcfg" \
+       --modules "bash base" \
        $DRACUT_EXTRA_ARGS \
-       $DRACUT_OUT
+       $DRACUT_OUT || _fail "dracut failed"
+
+_rt_xattr_vm_networkless_set "$DRACUT_OUT"

diff --git a/cut_fstests_local.sh b/cut_fstests_local.sh
index b4471af1348edb0d9ae1f7598121cfba0f529e65..4ad8e14044dc44dcaa6a4005c1bb8a1559cbd8f3 100755 (executable)
--- a/cut_fstests_local.sh
+++ b/cut_fstests_local.sh
@@ -27,12 +27,14 @@ dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
                   basename tee egrep hexdump sync xfs_db xfs_io \
                   xfs_logprint xfs_repair xfs_growfs \
                   fstrim fio logger dmsetup chattr lsattr cmp stat \
-                  dbench /usr/share/dbench/client.txt" \
+                  dbench /usr/share/dbench/client.txt hostname" \
        --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" \
-       --modules "bash base network ifcfg" \
+       --modules "bash base" \
        $DRACUT_EXTRA_ARGS \
-       $DRACUT_OUT
+       $DRACUT_OUT || _fail "dracut failed"
+
+_rt_xattr_vm_networkless_set "$DRACUT_OUT"

diff --git a/cut_qemu_rbd.sh b/cut_qemu_rbd.sh
index b23c87c2652313305c1665dbceb7af949b75a709..d2fb4f1c3be9af55776f107e3ac3c7f77f32e5ea 100755 (executable)
--- a/cut_qemu_rbd.sh
+++ b/cut_qemu_rbd.sh
@@ -22,7 +22,7 @@ dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
                   strace mkfs.xfs /lib64/libkeyutils.so.1 lsscsi" \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \
        --include "$RAPIDO_DIR/vm_autorun.env" "/.profile" \
-       --modules "bash base network ifcfg" \
+       --modules "bash base" \
        $DRACUT_EXTRA_ARGS \
        $DRACUT_OUT || _fail "dracut failed"
 
@@ -31,3 +31,4 @@ dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
 qemu_cut_args="-drive format=rbd,file=rbd:${CEPH_RBD_POOL}/${CEPH_RBD_IMAGE}"
 qemu_cut_args="${qemu_cut_args}:conf=${CEPH_CONF},if=virtio,cache=none,format=raw"
 _rt_xattr_qemu_args_set "$DRACUT_OUT"  "$qemu_cut_args"
+_rt_xattr_vm_networkless_set "$DRACUT_OUT"