From cdebbcc684f3139ac0161ef44751d9f250f06f79 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 30 Mar 2021 12:17:23 +0200 Subject: [PATCH] fix(TEST RAID-DEG): shellcheck --- test/TEST-12-RAID-DEG/.shchkdir | 0 test/TEST-12-RAID-DEG/create-root.sh | 6 +- test/TEST-12-RAID-DEG/cryptroot-ask.sh | 4 +- test/TEST-12-RAID-DEG/test-init.sh | 116 +--------------------- test/TEST-12-RAID-DEG/test.sh | 127 ++++++++++++++----------- 5 files changed, 81 insertions(+), 172 deletions(-) create mode 100644 test/TEST-12-RAID-DEG/.shchkdir diff --git a/test/TEST-12-RAID-DEG/.shchkdir b/test/TEST-12-RAID-DEG/.shchkdir new file mode 100644 index 00000000..e69de29b diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh index 77273411..2ad00fa5 100755 --- a/test/TEST-12-RAID-DEG/create-root.sh +++ b/test/TEST-12-RAID-DEG/create-root.sh @@ -4,7 +4,7 @@ trap 'poweroff -f' EXIT 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 @@ -39,10 +39,10 @@ udevadm settle mdadm --detail --export /dev/md0 | grep -F MD_UUID > /tmp/mduuid . /tmp/mduuid udevadm settle -eval $(udevadm info --query=env --name=/dev/md0 | while read line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo $line; done) +eval "$(udevadm info --query=env --name=/dev/md0 | while read -r line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo "$line"; done)" { echo "dracut-root-block-created" - echo MD_UUID=$MD_UUID + echo MD_UUID="$MD_UUID" echo "ID_FS_UUID=$ID_FS_UUID" } | dd oflag=direct,dsync of=/dev/sda sync diff --git a/test/TEST-12-RAID-DEG/cryptroot-ask.sh b/test/TEST-12-RAID-DEG/cryptroot-ask.sh index 7318fa70..a6b7ac70 100755 --- a/test/TEST-12-RAID-DEG/cryptroot-ask.sh +++ b/test/TEST-12-RAID-DEG/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-12-RAID-DEG/test-init.sh b/test/TEST-12-RAID-DEG/test-init.sh index fe022db5..dd5c57de 100755 --- a/test/TEST-12-RAID-DEG/test-init.sh +++ b/test/TEST-12-RAID-DEG/test-init.sh @@ -1,114 +1,10 @@ #!/bin/sh +. /lib/dracut-lib.sh + export PATH=/sbin:/bin:/usr/sbin:/usr/bin -getcmdline() { - while read -r _line || [ -n "$_line" ]; do - printf "%s" "$_line" - done < /proc/cmdline -} - -_dogetarg() { - local _o _val _doecho - unset _val - unset _o - unset _doecho - CMDLINE=$(getcmdline) - - for _o in $CMDLINE; do - if [ "${_o%%=*}" = "${1%%=*}" ]; then - if [ -n "${1#*=}" -a "${1#*=*}" != "${1}" ]; then - # if $1 has a "=", we want the exact match - if [ "$_o" = "$1" ]; then - _val="1" - unset _doecho - fi - continue - fi - - if [ "${_o#*=}" = "$_o" ]; then - # if cmdline argument has no "=", we assume "=1" - _val="1" - unset _doecho - continue - fi - - _val="${_o#*=}" - _doecho=1 - fi - done - if [ -n "$_val" ]; then - [ "x$_doecho" != "x" ] && echo "$_val" - return 0 - fi - return 1 -} - -getarg() { - local _deprecated _newoption - while [ $# -gt 0 ]; do - case $1 in - -d) - _deprecated=1 - shift - ;; - -y) - if _dogetarg $2 > /dev/null; then - if [ "$_deprecated" = "1" ]; then - [ -n "$_newoption" ] && warn "Kernel command line option '$2' is deprecated, use '$_newoption' instead." || warn "Option '$2' is deprecated." - fi - echo 1 - return 0 - fi - _deprecated=0 - shift 2 - ;; - -n) - if _dogetarg $2 > /dev/null; then - echo 0 - if [ "$_deprecated" = "1" ]; then - [ -n "$_newoption" ] && warn "Kernel command line option '$2' is deprecated, use '$_newoption=0' instead." || warn "Option '$2' is deprecated." - fi - return 1 - fi - _deprecated=0 - shift 2 - ;; - *) - if [ -z "$_newoption" ]; then - _newoption="$1" - fi - if _dogetarg $1; then - if [ "$_deprecated" = "1" ]; then - [ -n "$_newoption" ] && warn "Kernel command line option '$1' is deprecated, use '$_newoption' instead." || warn "Option '$1' is deprecated." - fi - return 0 - fi - _deprecated=0 - shift - ;; - esac - done - return 1 -} - -getargbool() { - local _b - unset _b - local _default - _default="$1" - shift - _b=$(getarg "$@") - [ $? -ne 0 -a -z "$_b" ] && _b="$_default" - if [ -n "$_b" ]; then - [ $_b = "0" ] && return 1 - [ $_b = "no" ] && return 1 - [ $_b = "off" ] && return 1 - fi - return 0 -} -strstr() { [ "${1##*"$2"*}" != "$1" ]; } -CMDLINE=$(while read line || [ -n "$line" ]; do echo $line; done < /proc/cmdline) -command -v plymouth > /dev/null && plymouth --quit +command -v plymouth > /dev/null 2>&1 && plymouth --quit exec > /dev/console 2>&1 + echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sda export TERM=linux export PS1='initramfs-test:\w\$ ' @@ -123,7 +19,5 @@ mount -n -o remount,ro / if [ -d /run/initramfs/etc ]; then echo " rd.debug=0 " >> /run/initramfs/etc/cmdline fi -if [ -e /lib/systemd/systemd-shutdown ]; then - exec /lib/systemd/systemd-shutdown poweroff -fi +sync poweroff -f diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index 3dbb0bb1..2e7aa3ef 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -1,4 +1,5 @@ #!/bin/bash +# shellcheck disable=SC2034 TEST_DESCRIPTION="root filesystem on an encrypted LVM PV on a degraded RAID-5" KVERSION=${KVERSION-$(uname -r)} @@ -10,63 +11,65 @@ KVERSION=${KVERSION-$(uname -r)} #DEBUGFAIL="rd.shell loglevel=70 systemd.log_target=kmsg" client_run() { - echo "CLIENT TEST START: $@" - cp --sparse=always --reflink=auto $TESTDIR/disk2.img $TESTDIR/disk2.img.new - cp --sparse=always --reflink=auto $TESTDIR/disk3.img $TESTDIR/disk3.img.new + echo "CLIENT TEST START: $*" + cp --sparse=always --reflink=auto "$TESTDIR"/disk2.img "$TESTDIR"/disk2.img.new + cp --sparse=always --reflink=auto "$TESTDIR"/disk3.img "$TESTDIR"/disk3.img.new - $testdir/run-qemu \ - -drive format=raw,index=0,media=disk,file=$TESTDIR/marker.img \ - -drive format=raw,index=2,media=disk,file=$TESTDIR/disk2.img.new \ - -drive format=raw,index=3,media=disk,file=$TESTDIR/disk3.img.new \ + "$testdir"/run-qemu \ + -drive format=raw,index=0,media=disk,file="$TESTDIR"/marker.img \ + -drive format=raw,index=2,media=disk,file="$TESTDIR"/disk2.img.new \ + -drive format=raw,index=3,media=disk,file="$TESTDIR"/disk3.img.new \ -append "panic=1 systemd.crash_reboot $* systemd.log_target=kmsg root=LABEL=root rw rd.retry=10 rd.info console=ttyS0,115200n81 log_buf_len=2M selinux=0 rd.shell=0 $DEBUGFAIL " \ - -initrd $TESTDIR/initramfs.testing - if ! grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/marker.img; then - echo "CLIENT TEST END: $@ [FAIL]" + -initrd "$TESTDIR"/initramfs.testing + if ! grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success "$TESTDIR"/marker.img; then + echo "CLIENT TEST END: $* [FAIL]" return 1 fi - rm -f -- $TESTDIR/marker.img - dd if=/dev/zero of=$TESTDIR/marker.img bs=1M count=40 + rm -f -- "$TESTDIR"/marker.img + dd if=/dev/zero of="$TESTDIR"/marker.img bs=1M count=40 - echo "CLIENT TEST END: $@ [OK]" + echo "CLIENT TEST END: $* [OK]" return 0 } test_run() { - read LUKS_UUID < $TESTDIR/luksuuid - read MD_UUID < $TESTDIR/mduuid + read -r LUKS_UUID < "$TESTDIR"/luksuuid + read -r MD_UUID < "$TESTDIR"/mduuid client_run failme && return 1 client_run rd.auto || return 1 - client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.md.conf=0 rd.lvm.vg=dracut || return 1 + client_run rd.luks.uuid="$LUKS_UUID" rd.md.uuid="$MD_UUID" rd.md.conf=0 rd.lvm.vg=dracut || return 1 - client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=failme rd.md.conf=0 rd.lvm.vg=dracut failme && return 1 + client_run rd.luks.uuid="$LUKS_UUID" rd.md.uuid=failme rd.md.conf=0 rd.lvm.vg=dracut failme && return 1 - client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm=0 failme && return 1 - client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm=0 rd.auto=1 failme && return 1 - client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm.vg=failme failme && return 1 - client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm.vg=dracut || return 1 - client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm.lv=dracut/failme failme && return 1 - client_run rd.luks.uuid=$LUKS_UUID rd.md.uuid=$MD_UUID rd.lvm.lv=dracut/root || return 1 + client_run rd.luks.uuid="$LUKS_UUID" rd.md.uuid="$MD_UUID" rd.lvm=0 failme && return 1 + client_run rd.luks.uuid="$LUKS_UUID" rd.md.uuid="$MD_UUID" rd.lvm=0 rd.auto=1 failme && return 1 + client_run rd.luks.uuid="$LUKS_UUID" rd.md.uuid="$MD_UUID" rd.lvm.vg=failme failme && return 1 + client_run rd.luks.uuid="$LUKS_UUID" rd.md.uuid="$MD_UUID" rd.lvm.vg=dracut || return 1 + client_run rd.luks.uuid="$LUKS_UUID" rd.md.uuid="$MD_UUID" rd.lvm.lv=dracut/failme failme && return 1 + client_run rd.luks.uuid="$LUKS_UUID" rd.md.uuid="$MD_UUID" rd.lvm.lv=dracut/root || return 1 return 0 } test_setup() { # Create the blank file to use as a root filesystem - rm -f -- $TESTDIR/marker.img - dd if=/dev/zero of=$TESTDIR/marker.img bs=1M count=40 - dd if=/dev/zero of=$TESTDIR/disk1.img bs=1M count=35 - dd if=/dev/zero of=$TESTDIR/disk2.img bs=1M count=35 - dd if=/dev/zero of=$TESTDIR/disk3.img bs=1M count=35 + rm -f -- "$TESTDIR"/marker.img + dd if=/dev/zero of="$TESTDIR"/marker.img bs=1M count=40 + dd if=/dev/zero of="$TESTDIR"/disk1.img bs=1M count=35 + dd if=/dev/zero of="$TESTDIR"/disk2.img bs=1M count=35 + dd if=/dev/zero of="$TESTDIR"/disk3.img bs=1M count=35 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 @@ -74,25 +77,34 @@ test_setup() { done ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient dd + mount dmesg dhclient mkdir cp ping dhclient dd sync for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done inst_multiple -o ${_terminfodir}/l/linux inst "$basedir/modules.d/35network-legacy/dhclient-script.sh" "/sbin/dhclient-script" inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup" + + inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" + inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + ln -s dracut-util "${initdir}/usr/bin/dracut-getarg" + ln -s dracut-util "${initdir}/usr/bin/dracut-getargs" + inst_multiple grep inst_simple /etc/os-release inst ./test-init.sh /sbin/init 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 inst_multiple sfdisk mke2fs poweroff cp umount dd grep sync inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -102,52 +114,55 @@ 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 crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \ -d "piix ide-gd_mod ata_piix ext2 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/marker.img \ - -drive format=raw,index=1,media=disk,file=$TESTDIR/disk1.img \ - -drive format=raw,index=2,media=disk,file=$TESTDIR/disk2.img \ - -drive format=raw,index=3,media=disk,file=$TESTDIR/disk3.img \ + "$testdir"/run-qemu \ + -drive format=raw,index=0,media=disk,file="$TESTDIR"/marker.img \ + -drive format=raw,index=1,media=disk,file="$TESTDIR"/disk1.img \ + -drive format=raw,index=2,media=disk,file="$TESTDIR"/disk2.img \ + -drive format=raw,index=3,media=disk,file="$TESTDIR"/disk3.img \ -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ - -initrd $TESTDIR/initramfs.makeroot || return 1 + -initrd "$TESTDIR"/initramfs.makeroot || return 1 - grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/marker.img || return 1 - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/marker.img) - eval $(grep -F -a -m 1 ID_FS_UUID $TESTDIR/marker.img) - echo $ID_FS_UUID > $TESTDIR/luksuuid - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/marker.img) - echo "$MD_UUID" > $TESTDIR/mduuid + grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created "$TESTDIR"/marker.img || return 1 + eval "$(grep -F --binary-files=text -m 1 MD_UUID "$TESTDIR"/marker.img)" + eval "$(grep -F -a -m 1 ID_FS_UUID "$TESTDIR"/marker.img)" + echo "$ID_FS_UUID" > "$TESTDIR"/luksuuid + eval "$(grep -F --binary-files=text -m 1 MD_UUID "$TESTDIR"/marker.img)" + echo "$MD_UUID" > "$TESTDIR"/mduuid ( + # 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_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules inst ./cryptroot-ask.sh /sbin/cryptroot-ask - mkdir -p $initdir/etc - echo "ARRAY /dev/md0 level=raid5 num-devices=3 UUID=$MD_UUID" > $initdir/etc/mdadm.conf - echo "luks-$ID_FS_UUID UUID=$ID_FS_UUID /etc/key" > $initdir/etc/crypttab - echo -n test > $initdir/etc/key + mkdir -p "$initdir"/etc + echo "ARRAY /dev/md0 level=raid5 num-devices=3 UUID=$MD_UUID" > "$initdir"/etc/mdadm.conf + echo "luks-$ID_FS_UUID UUID=$ID_FS_UUID /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 / \ -o "plymouth network kernel-network-modules" \ -a "debug" \ -d "piix ide-gd_mod ata_piix ext2 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