diff --git a/test/TEST-15-BTRFSRAID/.shchkdir b/test/TEST-15-BTRFSRAID/.shchkdir new file mode 100644 index 00000000..e69de29b diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh index 0e3336e2..380a8d14 100755 --- a/test/TEST-15-BTRFSRAID/create-root.sh +++ b/test/TEST-15-BTRFSRAID/create-root.sh @@ -1,7 +1,7 @@ #!/bin/sh # don't let udev and this script step on eachother's toes for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do - > "/etc/udev/rules.d/$x" + : > "/etc/udev/rules.d/$x" done modprobe btrfs udevadm control --reload diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh index 43573a0b..7addd6dc 100755 --- a/test/TEST-15-BTRFSRAID/test.sh +++ b/test/TEST-15-BTRFSRAID/test.sh @@ -1,4 +1,5 @@ #!/bin/bash +# shellcheck disable=SC2034 TEST_DESCRIPTION="root filesystem on multiple device btrfs" KVERSION=${KVERSION-$(uname -r)} @@ -8,28 +9,30 @@ KVERSION=${KVERSION-$(uname -r)} test_run() { DISKIMAGE=$TESTDIR/TEST-15-BTRFSRAID-root.img MARKER_DISKIMAGE=$TESTDIR/TEST-15-BTRFSRAID-marker.img - dd if=/dev/zero of=$MARKER_DISKIMAGE bs=512 count=10 - $testdir/run-qemu \ - -drive format=raw,index=0,media=disk,file=$MARKER_DISKIMAGE \ - -drive format=raw,index=1,media=disk,file=$DISKIMAGE \ + dd if=/dev/zero of="$MARKER_DISKIMAGE" bs=512 count=10 + "$testdir"/run-qemu \ + -drive format=raw,index=0,media=disk,file="$MARKER_DISKIMAGE" \ + -drive format=raw,index=1,media=disk,file="$DISKIMAGE" \ -append "panic=1 systemd.crash_reboot root=LABEL=root rw rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \ - -initrd $TESTDIR/initramfs.testing - grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $MARKER_DISKIMAGE || return 1 + -initrd "$TESTDIR"/initramfs.testing + grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success "$MARKER_DISKIMAGE" || return 1 } test_setup() { # Create the blank file to use as a root filesystem DISKIMAGE=$TESTDIR/TEST-15-BTRFSRAID-root.img - rm -f -- $DISKIMAGE - dd if=/dev/zero of=$DISKIMAGE bs=1M count=1024 + rm -f -- "$DISKIMAGE" + dd if=/dev/zero of="$DISKIMAGE" bs=1M count=1024 kernel=$KVERSION # Create what will eventually be our root filesystem onto an overlay ( + # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source - . $basedir/dracut-init.sh + # shellcheck disable=SC1090 + . "$basedir"/dracut-init.sh ( - cd "$initdir" + cd "$initdir" || exit mkdir -p -- dev sys proc etc var/run tmp mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin for i in bin sbin lib lib64; do @@ -49,14 +52,17 @@ test_setup() { inst ./test-init.sh /sbin/init inst_simple /etc/os-release find_binary plymouth > /dev/null && inst_multiple plymouth - cp -a /etc/ld.so.conf* $initdir/etc + cp -a /etc/ld.so.conf* "$initdir"/etc ldconfig -r "$initdir" ) # second, install the files needed to make the root filesystem ( + # shellcheck disable=SC2031 + # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay - . $basedir/dracut-init.sh + # shellcheck disable=SC1090 + . "$basedir"/dracut-init.sh inst_multiple sfdisk mkfs.btrfs poweroff cp umount dd sync inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -66,41 +72,44 @@ test_setup() { # create an initramfs that will create the target root filesystem. # We do it this way so that we do not risk trashing the host mdraid # devices, volume groups, encrypted partitions, etc. - $basedir/dracut.sh -l -i $TESTDIR/overlay / \ + "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ -m "bash btrfs udev-rules base rootfs-block fs-lib kernel-modules qemu" \ -d "piix ide-gd_mod ata_piix btrfs sd_mod" \ --nomdadmconf \ --no-hostonly-cmdline -N \ - -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 + -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1 - rm -rf -- $TESTDIR/overlay + rm -rf -- "$TESTDIR"/overlay # Invoke KVM and/or QEMU to actually create the target filesystem. - $testdir/run-qemu \ - -drive format=raw,index=0,media=disk,file=$DISKIMAGE \ + "$testdir"/run-qemu \ + -drive format=raw,index=0,media=disk,file="$DISKIMAGE" \ -append "root=/dev/fakeroot rw quiet console=ttyS0,115200n81 selinux=0" \ - -initrd $TESTDIR/initramfs.makeroot || return 1 + -initrd "$TESTDIR"/initramfs.makeroot || return 1 - dd if=$DISKIMAGE bs=512 count=4 skip=2048 | grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created || return 1 + dd if="$DISKIMAGE" bs=512 count=4 skip=2048 | grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created || return 1 ( + # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay - . $basedir/dracut-init.sh + # shellcheck disable=SC1090 + . "$basedir"/dracut-init.sh inst_multiple poweroff shutdown inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules ) - $basedir/dracut.sh -l -i $TESTDIR/overlay / \ + "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ -o "plymouth network kernel-network-modules" \ -a "debug" \ -d "piix ide-gd_mod ata_piix btrfs sd_mod" \ --no-hostonly-cmdline -N \ - -f $TESTDIR/initramfs.testing $KVERSION || return 1 + -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 } test_cleanup() { return 0 } -. $testdir/test-functions +# shellcheck disable=SC1090 +. "$testdir"/test-functions