From 77854c6d2d9aa882a9b4f59ba589e9bc641331bb Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 30 Mar 2021 12:19:52 +0200 Subject: [PATCH] fix(TEST NBD): shellcheck --- test/TEST-40-NBD/.shchkdir | 0 test/TEST-40-NBD/client-init.sh | 8 +- test/TEST-40-NBD/create-client-root.sh | 2 +- test/TEST-40-NBD/create-encrypted-root.sh | 4 +- test/TEST-40-NBD/create-server-root.sh | 2 +- test/TEST-40-NBD/cryptroot-ask.sh | 4 +- test/TEST-40-NBD/server-init.sh | 10 +- test/TEST-40-NBD/test.sh | 179 ++++++++++++---------- 8 files changed, 116 insertions(+), 93 deletions(-) create mode 100644 test/TEST-40-NBD/.shchkdir diff --git a/test/TEST-40-NBD/.shchkdir b/test/TEST-40-NBD/.shchkdir new file mode 100644 index 00000000..e69de29b diff --git a/test/TEST-40-NBD/client-init.sh b/test/TEST-40-NBD/client-init.sh index 0a0f6c1c..5adb66f2 100755 --- a/test/TEST-40-NBD/client-init.sh +++ b/test/TEST-40-NBD/client-init.sh @@ -1,8 +1,8 @@ #!/bin/sh -> /dev/watchdog +: > /dev/watchdog export PATH=/sbin:/bin:/usr/sbin:/usr/bin exec > /dev/console 2>&1 -while read dev fs fstype opts rest || [ -n "$dev" ]; do +while read -r dev fs fstype opts rest || [ -n "$dev" ]; do [ "$dev" = "rootfs" ] && continue [ "$fs" != "/" ] && continue echo "nbd-OK $fstype $opts" | dd oflag=direct,dsync of=/dev/sda @@ -14,7 +14,7 @@ export PS1='nbdclient-test:\w\$ ' stty sane echo "made it to the rootfs! Powering down." #sh -i -> /dev/watchdog +: > /dev/watchdog mount -n -o remount,ro / &> /dev/null -> /dev/watchdog +: > /dev/watchdog poweroff -f diff --git a/test/TEST-40-NBD/create-client-root.sh b/test/TEST-40-NBD/create-client-root.sh index 69b51ee8..535e046b 100755 --- a/test/TEST-40-NBD/create-client-root.sh +++ b/test/TEST-40-NBD/create-client-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 rm -f -- /etc/lvm/lvm.conf udevadm control --reload diff --git a/test/TEST-40-NBD/create-encrypted-root.sh b/test/TEST-40-NBD/create-encrypted-root.sh index f605c0e4..bbd48b8e 100755 --- a/test/TEST-40-NBD/create-encrypted-root.sh +++ b/test/TEST-40-NBD/create-encrypted-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 rm -f -- /etc/lvm/lvm.conf udevadm control --reload @@ -26,7 +26,7 @@ udevadm settle cryptsetup luksClose /dev/mapper/dracut_crypt_test udevadm settle sleep 1 -eval $(udevadm info --query=env --name=/dev/sda | while read line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo $line; done) +eval "$(udevadm info --query=env --name=/dev/sda | while read -r line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo "$line"; done)" { echo "dracut-root-block-created" echo "ID_FS_UUID=$ID_FS_UUID" diff --git a/test/TEST-40-NBD/create-server-root.sh b/test/TEST-40-NBD/create-server-root.sh index 69b51ee8..535e046b 100755 --- a/test/TEST-40-NBD/create-server-root.sh +++ b/test/TEST-40-NBD/create-server-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 rm -f -- /etc/lvm/lvm.conf udevadm control --reload diff --git a/test/TEST-40-NBD/cryptroot-ask.sh b/test/TEST-40-NBD/cryptroot-ask.sh index 7318fa70..a6b7ac70 100755 --- a/test/TEST-40-NBD/cryptroot-ask.sh +++ b/test/TEST-40-NBD/cryptroot-ask.sh @@ -1,5 +1,5 @@ #!/bin/sh -[ -b /dev/mapper/$2 ] && exit 0 +[ -b /dev/mapper/"$2" ] && exit 0 printf test > /keyfile -/sbin/cryptsetup luksOpen $1 $2 < /keyfile +/sbin/cryptsetup luksOpen "$1" "$2" < /keyfile diff --git a/test/TEST-40-NBD/server-init.sh b/test/TEST-40-NBD/server-init.sh index eb7e9942..e22c6496 100755 --- a/test/TEST-40-NBD/server-init.sh +++ b/test/TEST-40-NBD/server-init.sh @@ -12,10 +12,10 @@ wait_for_if_link() { local cnt=0 local li while [ $cnt -lt 600 ]; do - li=$(ip -o link show dev $1 2> /dev/null) + li=$(ip -o link show dev "$1" 2> /dev/null) [ -n "$li" ] && return 0 if [[ $2 ]]; then - li=$(ip -o link show dev $2 2> /dev/null) + li=$(ip -o link show dev "$2" 2> /dev/null) [ -n "$li" ] && return 0 fi sleep 0.1 @@ -28,7 +28,7 @@ wait_for_if_up() { local cnt=0 local li while [ $cnt -lt 200 ]; do - li=$(ip -o link show up dev $1) + li=$(ip -o link show up dev "$1") [ -n "$li" ] && return 0 sleep 0.1 cnt=$((cnt + 1)) @@ -48,7 +48,7 @@ wait_for_route_ok() { } linkup() { - wait_for_if_link $1 2> /dev/null && ip link set $1 up 2> /dev/null && wait_for_if_up $1 2> /dev/null + wait_for_if_link "$1" 2> /dev/null && ip link set "$1" up 2> /dev/null && wait_for_if_up "$1" 2> /dev/null } wait_for_if_link eth0 ens3 @@ -61,7 +61,7 @@ linkup ens3 modprobe af_packet nbd-server -> /var/lib/dhcpd/dhcpd.leases +: > /var/lib/dhcpd/dhcpd.leases chmod 777 /var/lib/dhcpd/dhcpd.leases dhcpd -d -cf /etc/dhcpd.conf -lf /var/lib/dhcpd/dhcpd.leases & echo "Serving NBD disks" diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index b9abd2d0..e9063c2e 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -1,5 +1,6 @@ #!/bin/bash +# shellcheck disable=SC2034 TEST_DESCRIPTION="root filesystem on NBD" KVERSION=${KVERSION-$(uname -r)} @@ -17,7 +18,7 @@ test_check() { return 1 fi - if ! modinfo -k $KVERSION nbd &> /dev/null; then + if ! modinfo -k "$KVERSION" nbd &> /dev/null; then echo "Kernel module nbd does not exist" return 1 fi @@ -29,17 +30,16 @@ run_server() { # Start server first echo "NBD TEST SETUP: Starting DHCP/NBD server" - $testdir/run-qemu \ - -drive format=raw,index=0,media=disk,file=$TESTDIR/server.ext3 \ - -drive format=raw,index=1,media=disk,file=$TESTDIR/nbd.ext3 \ - -drive format=raw,index=2,media=disk,file=$TESTDIR/encrypted.ext3 \ + "$testdir"/run-qemu \ + -drive format=raw,index=0,media=disk,file="$TESTDIR"/server.ext3 \ + -drive format=raw,index=1,media=disk,file="$TESTDIR"/nbd.ext3 \ + -drive format=raw,index=2,media=disk,file="$TESTDIR"/encrypted.ext3 \ -net nic,macaddr=52:54:00:12:34:56,model=e1000 \ -net socket,listen=127.0.0.1:12340 \ - ${SERIAL:+-serial "$SERIAL"} \ - ${SERIAL:--serial file:"$TESTDIR"/server.log} \ + -serial "${SERIAL:-"file:$TESTDIR/server.log"}" \ -append "panic=1 systemd.crash_reboot root=/dev/sda rootfstype=ext3 rw quiet console=ttyS0,115200n81 selinux=0" \ - -initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1 - chmod 644 $TESTDIR/server.pid || return 1 + -initrd "$TESTDIR"/initramfs.server -pidfile "$TESTDIR"/server.pid -daemonize || return 1 + chmod 644 "$TESTDIR"/server.pid || return 1 # Cleanup the terminal if we have one tty -s && stty sane @@ -71,25 +71,26 @@ client_test() { echo "CLIENT TEST START: $test_name" # Clear out the flags for each test - if ! dd if=/dev/zero of=$TESTDIR/flag.img bs=1M count=1; then + if ! dd if=/dev/zero of="$TESTDIR"/flag.img bs=1M count=1; then echo "Unable to make client flag image" 1>&2 return 1 fi - $testdir/run-qemu \ - -drive format=raw,index=0,media=disk,file=$TESTDIR/flag.img \ - -net nic,macaddr=$mac,model=e1000 \ + "$testdir"/run-qemu \ + -drive format=raw,index=0,media=disk,file="$TESTDIR"/flag.img \ + -net nic,macaddr="$mac",model=e1000 \ -net socket,connect=127.0.0.1:12340 \ -append "panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81 selinux=0 " \ - -initrd $TESTDIR/initramfs.testing + -initrd "$TESTDIR"/initramfs.testing - if [[ $? -ne 0 ]] || ! grep -U --binary-files=binary -F -m 1 -q nbd-OK $TESTDIR/flag.img; then + # shellcheck disable=SC2181 + if [[ $? -ne 0 ]] || ! grep -U --binary-files=binary -F -m 1 -q nbd-OK "$TESTDIR"/flag.img; then echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]" return 1 fi # nbdinfo=( fstype fsoptions ) - nbdinfo=($(awk '{print $2, $3; exit}' $TESTDIR/flag.img)) + read -a -r nbdinfo < <(awk '{print $2, $3; exit}' "$TESTDIR"/flag.img) if [[ ${nbdinfo[0]} != "$fstype" ]]; then echo "CLIENT TEST END: $test_name [FAILED - WRONG FS TYPE] \"${nbdinfo[0]}\" != \"$fstype\"" @@ -98,7 +99,7 @@ client_test() { opts=${nbdinfo[1]}, while [[ $opts ]]; do - if [[ ${opts%%,*} == $fsopt ]]; then + if [[ ${opts%%,*} == "$fsopt" ]]; then found=1 break fi @@ -181,7 +182,8 @@ client_run() { # Encrypted root handling via LVM/LUKS over NBD - . $TESTDIR/luks.uuid + # shellcheck disable=SC1090 + . "$TESTDIR"/luks.uuid client_test "NBD root=LABEL=dracut netroot=nbd:IP:port" \ 52:54:00:12:34:00 \ @@ -195,26 +197,28 @@ client_run() { # "root=LABEL=dracut rd.luks.uuid=$ID_FS_UUID rd.lv.vg=dracut netroot=dhcp" || return 1 if [[ -s server.pid ]]; then - kill -TERM $(cat $TESTDIR/server.pid) - rm -f -- $TESTDIR/server.pid + kill -TERM "$(cat "$TESTDIR"/server.pid)" + rm -f -- "$TESTDIR"/server.pid fi } make_encrypted_root() { # Create the blank file to use as a root filesystem - dd if=/dev/zero of=$TESTDIR/encrypted.ext3 bs=1M count=80 - dd if=/dev/zero of=$TESTDIR/flag.img bs=1M count=1 + dd if=/dev/zero of="$TESTDIR"/encrypted.ext3 bs=1M count=80 + dd if=/dev/zero of="$TESTDIR"/flag.img bs=1M count=1 rm -fr "$TESTDIR"/overlay 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 mkdir -p "$initdir" ( - 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 @@ -231,16 +235,19 @@ make_encrypted_root() { inst ./client-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=SC2030 + # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay - . $basedir/dracut-init.sh + # shellcheck disable=SC1090 + . "$basedir"/dracut-init.sh ( - cd "$initdir" + cd "$initdir" || exit mkdir -p dev sys proc etc tmp var run root usr/bin usr/lib usr/lib64 usr/sbin for i in bin sbin lib lib64; do ln -sfnr usr/$i $i @@ -258,36 +265,39 @@ make_encrypted_root() { # 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 "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \ -d "piix ide-gd_mod ata_piix ext3 ext3 sd_mod" \ --no-hostonly-cmdline -N \ - -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 - rm -rf -- $TESTDIR/overlay + -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1 + 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=$TESTDIR/encrypted.ext3 \ - -drive format=raw,index=1,media=disk,file=$TESTDIR/flag.img \ + "$testdir"/run-qemu \ + -drive format=raw,index=0,media=disk,file="$TESTDIR"/encrypted.ext3 \ + -drive format=raw,index=1,media=disk,file="$TESTDIR"/flag.img \ -append "root=/dev/fakeroot rw quiet console=ttyS0,115200n81 selinux=0" \ - -initrd $TESTDIR/initramfs.makeroot || return 1 - grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1 - grep -F -a -m 1 ID_FS_UUID $TESTDIR/flag.img > $TESTDIR/luks.uuid + -initrd "$TESTDIR"/initramfs.makeroot || return 1 + grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created "$TESTDIR"/flag.img || return 1 + grep -F -a -m 1 ID_FS_UUID "$TESTDIR"/flag.img > "$TESTDIR"/luks.uuid } make_client_root() { - dd if=/dev/zero of=$TESTDIR/nbd.ext3 bs=1M count=120 - dd if=/dev/zero of=$TESTDIR/flag.img bs=1M count=1 + dd if=/dev/zero of="$TESTDIR"/nbd.ext3 bs=1M count=120 + dd if=/dev/zero of="$TESTDIR"/flag.img bs=1M count=1 rm -fr "$TESTDIR"/overlay kernel=$KVERSION ( - mkdir -p $TESTDIR/overlay/source + mkdir -p "$TESTDIR"/overlay/source + # shellcheck disable=SC2030 + # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay/source + # shellcheck disable=SC1090 . "$basedir"/dracut-init.sh mkdir -p "$initdir" ( - 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 @@ -307,16 +317,19 @@ make_client_root() { inst /etc/group /etc/group for i in /usr/lib*/libnss_files* /lib*/libnss_files*; do [ -e "$i" ] || continue - inst $i + inst "$i" done - 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=SC2030 + # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay - . $basedir/dracut-init.sh + # shellcheck disable=SC1090 + . "$basedir"/dracut-init.sh inst_multiple sfdisk mkfs.ext3 poweroff cp umount sync dd inst_hook initqueue 01 ./create-client-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -326,36 +339,39 @@ make_client_root() { # 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 "dash udev-rules base rootfs-block fs-lib kernel-modules fs-lib qemu" \ -d "piix ide-gd_mod ata_piix ext3 sd_mod" \ --nomdadmconf \ --no-hostonly-cmdline -N \ - -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 + -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1 # Invoke KVM and/or QEMU to actually create the target filesystem. - $testdir/run-qemu \ - -drive format=raw,index=0,media=disk,file=$TESTDIR/nbd.ext3 \ - -drive format=raw,index=1,media=disk,file=$TESTDIR/flag.img \ + "$testdir"/run-qemu \ + -drive format=raw,index=0,media=disk,file="$TESTDIR"/nbd.ext3 \ + -drive format=raw,index=1,media=disk,file="$TESTDIR"/flag.img \ -append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \ - -initrd $TESTDIR/initramfs.makeroot || return 1 - grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1 + -initrd "$TESTDIR"/initramfs.makeroot || return 1 + grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created "$TESTDIR"/flag.img || return 1 rm -fr "$TESTDIR"/overlay } make_server_root() { - dd if=/dev/zero of=$TESTDIR/server.ext3 bs=1M count=120 - dd if=/dev/zero of=$TESTDIR/flag.img bs=1M count=1 + dd if=/dev/zero of="$TESTDIR"/server.ext3 bs=1M count=120 + dd if=/dev/zero of="$TESTDIR"/flag.img bs=1M count=1 - rm -fr $TESTDIR/overlay + rm -fr "$TESTDIR"/overlay kernel=$KVERSION ( - mkdir -p $TESTDIR/overlay/source + mkdir -p "$TESTDIR"/overlay/source + # shellcheck disable=SC2030 + # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay/source + # shellcheck disable=SC1090 . "$basedir"/dracut-init.sh mkdir -p "$initdir" ( - cd "$initdir" + cd "$initdir" || exit mkdir -p run dev sys proc etc var var/lib/dhcpd tmp etc/nbd-server ln -s ../run var/run ) @@ -389,17 +405,20 @@ EOF inst /etc/group /etc/group for i in /usr/lib*/libnss_files* /lib*/libnss_files*; do [ -e "$i" ] || continue - inst $i + inst "$i" done - 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=SC2030 + # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay - . $basedir/dracut-init.sh + # shellcheck disable=SC1090 + . "$basedir"/dracut-init.sh inst_multiple sfdisk mkfs.ext3 poweroff cp umount sync dd inst_hook initqueue 01 ./create-server-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -409,20 +428,20 @@ EOF # 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 "dash udev-rules base rootfs-block fs-lib kernel-modules fs-lib qemu" \ -d "piix ide-gd_mod ata_piix ext3 sd_mod" \ --nomdadmconf \ --no-hostonly-cmdline -N \ - -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 + -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1 # Invoke KVM and/or QEMU to actually create the target filesystem. - $testdir/run-qemu \ - -drive format=raw,index=0,media=disk,file=$TESTDIR/server.ext3 \ - -drive format=raw,index=1,media=disk,file=$TESTDIR/flag.img \ + "$testdir"/run-qemu \ + -drive format=raw,index=0,media=disk,file="$TESTDIR"/server.ext3 \ + -drive format=raw,index=1,media=disk,file="$TESTDIR"/flag.img \ -append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \ - -initrd $TESTDIR/initramfs.makeroot || return 1 - grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1 + -initrd "$TESTDIR"/initramfs.makeroot || return 1 + grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created "$TESTDIR"/flag.img || return 1 rm -fr "$TESTDIR"/overlay } @@ -431,11 +450,13 @@ test_setup() { make_client_root || return 1 make_server_root || return 1 - rm -fr $TESTDIR/overlay + rm -fr "$TESTDIR"/overlay # Make the test image ( + # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay - . $basedir/dracut-init.sh + # shellcheck disable=SC1090 + . "$basedir"/dracut-init.sh inst_multiple poweroff shutdown dd inst_hook shutdown-emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules @@ -445,30 +466,31 @@ test_setup() { # mkdir -p "${initdir}/lib/systemd/system/sysinit.target.wants" # ln -fs ../debug-shell.service "${initdir}/lib/systemd/system/sysinit.target.wants/debug-shell.service" - . $TESTDIR/luks.uuid - mkdir -p $initdir/etc - echo "luks-$ID_FS_UUID /dev/nbd0 /etc/key" > $initdir/etc/crypttab - echo -n test > $initdir/etc/key + # shellcheck disable=SC1090 + . "$TESTDIR"/luks.uuid + mkdir -p "$initdir"/etc + echo "luks-$ID_FS_UUID /dev/nbd0 /etc/key" > "$initdir"/etc/crypttab + echo -n test > "$initdir"/etc/key ) - $basedir/dracut.sh -l -i $TESTDIR/overlay / \ + "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ -m "dash udev-rules rootfs-block fs-lib base debug kernel-modules" \ -d "af_packet piix ide-gd_mod ata_piix ext3 ext3 sd_mod e1000" \ --no-hostonly-cmdline -N \ - -f $TESTDIR/initramfs.server $KVERSION || return 1 + -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1 - $basedir/dracut.sh -l -i $TESTDIR/overlay / \ + "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ -o "plymouth" \ -a "debug watchdog" \ -d "af_packet piix ide-gd_mod ata_piix ext3 ext3 sd_mod e1000 i6300esb ib700wdt" \ --no-hostonly-cmdline -N \ - -f $TESTDIR/initramfs.testing $KVERSION || return 1 + -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 } kill_server() { if [[ -s $TESTDIR/server.pid ]]; then - kill -TERM $(cat $TESTDIR/server.pid) - rm -f -- $TESTDIR/server.pid + kill -TERM "$(cat "$TESTDIR"/server.pid)" + rm -f -- "$TESTDIR"/server.pid fi } @@ -476,4 +498,5 @@ test_cleanup() { kill_server } -. $testdir/test-functions +# shellcheck disable=SC1090 +. "$testdir"/test-functions