From 9ca53063ee3530280f9a656020d3beada2905342 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 28 Feb 2020 13:39:05 +0100 Subject: [PATCH] test: use dd to write status to marker disk --- test/TEST-01-BASIC/create-root.sh | 2 +- test/TEST-01-BASIC/test-init.sh | 2 +- test/TEST-01-BASIC/test.sh | 6 +++--- test/TEST-02-SYSTEMD/create-root.sh | 2 +- test/TEST-02-SYSTEMD/test-init.sh | 2 +- test/TEST-02-SYSTEMD/test.sh | 6 +++--- test/TEST-03-USR-MOUNT/create-root.sh | 2 +- test/TEST-03-USR-MOUNT/test-init.sh | 2 +- test/TEST-03-USR-MOUNT/test.sh | 6 +++--- test/TEST-04-FULL-SYSTEMD/create-root.sh | 2 +- test/TEST-04-FULL-SYSTEMD/test-init.sh | 2 +- test/TEST-04-FULL-SYSTEMD/test.sh | 6 +++--- test/TEST-10-RAID/create-root.sh | 2 +- test/TEST-10-RAID/test-init.sh | 2 +- test/TEST-10-RAID/test.sh | 6 +++--- test/TEST-11-LVM/create-root.sh | 2 +- test/TEST-11-LVM/test-init.sh | 2 +- test/TEST-11-LVM/test.sh | 6 +++--- test/TEST-12-RAID-DEG/create-root.sh | 2 +- test/TEST-12-RAID-DEG/test-init.sh | 2 +- test/TEST-12-RAID-DEG/test.sh | 4 ++-- test/TEST-13-ENC-RAID-LVM/create-root.sh | 2 +- test/TEST-13-ENC-RAID-LVM/test-init.sh | 2 +- test/TEST-13-ENC-RAID-LVM/test.sh | 6 +++--- test/TEST-14-IMSM/create-root.sh | 2 +- test/TEST-14-IMSM/test-init.sh | 2 +- test/TEST-14-IMSM/test.sh | 4 ++-- test/TEST-15-BTRFSRAID/create-root.sh | 2 +- test/TEST-15-BTRFSRAID/test-init.sh | 2 +- test/TEST-15-BTRFSRAID/test.sh | 4 ++-- test/TEST-16-DMSQUASH/test-init.sh | 2 +- test/TEST-16-DMSQUASH/test.sh | 2 +- test/TEST-17-LVM-THIN/create-root.sh | 2 +- test/TEST-17-LVM-THIN/test-init.sh | 2 +- test/TEST-17-LVM-THIN/test.sh | 4 ++-- test/TEST-20-NFS/client-init.sh | 2 +- test/TEST-20-NFS/test.sh | 2 +- test/TEST-30-ISCSI/client-init.sh | 2 +- test/TEST-30-ISCSI/create-root.sh | 2 +- test/TEST-30-ISCSI/test.sh | 4 ++-- test/TEST-35-ISCSI-MULTI/client-init.sh | 2 +- test/TEST-35-ISCSI-MULTI/create-root.sh | 2 +- test/TEST-35-ISCSI-MULTI/test.sh | 4 ++-- test/TEST-40-NBD/client-init.sh | 2 +- test/TEST-40-NBD/create-root.sh | 2 +- test/TEST-40-NBD/test.sh | 8 ++++---- test/TEST-50-MULTINIC/client-init.sh | 2 +- test/TEST-50-MULTINIC/test.sh | 2 +- test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh | 2 +- test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh | 2 +- 50 files changed, 73 insertions(+), 73 deletions(-) diff --git a/test/TEST-01-BASIC/create-root.sh b/test/TEST-01-BASIC/create-root.sh index 8b28c3098..97071fa35 100755 --- a/test/TEST-01-BASIC/create-root.sh +++ b/test/TEST-01-BASIC/create-root.sh @@ -19,7 +19,7 @@ mount /dev/sda2 /root cp -a -t /root /source/* mkdir -p /root/run umount /root -echo "dracut-root-block-created" >/dev/sda1 +echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/sda1 sync poweroff -f diff --git a/test/TEST-01-BASIC/test-init.sh b/test/TEST-01-BASIC/test-init.sh index 78f124a5b..07fd0ed48 100755 --- a/test/TEST-01-BASIC/test-init.sh +++ b/test/TEST-01-BASIC/test-init.sh @@ -100,7 +100,7 @@ strstr() { [ "${1##*"$2"*}" != "$1" ]; } CMDLINE=$(while read line || [ -n "$line" ]; do echo $line;done < /proc/cmdline) plymouth --quit exec >/dev/console 2>&1 -echo "dracut-root-block-success" >/dev/sdb +echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sdb export TERM=linux export PS1='initramfs-test:\w\$ ' [ -f /etc/mtab ] || ln -sfn /proc/mounts /etc/mtab diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 37f77c365..c47098eaf 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -38,7 +38,7 @@ test_setup() { ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ mount dmesg dhclient mkdir cp ping dhclient \ - umount strace less setsid + umount strace less setsid dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -57,7 +57,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mkfs.ext3 poweroff cp umount sync + inst_multiple sfdisk mkfs.ext3 poweroff cp umount sync dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules @@ -85,7 +85,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple poweroff shutdown + 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 diff --git a/test/TEST-02-SYSTEMD/create-root.sh b/test/TEST-02-SYSTEMD/create-root.sh index 0e60e7422..457a74bb0 100755 --- a/test/TEST-02-SYSTEMD/create-root.sh +++ b/test/TEST-02-SYSTEMD/create-root.sh @@ -19,6 +19,6 @@ mount /dev/sda2 /root cp -a -t /root /source/* mkdir -p /root/run umount /root -echo "dracut-root-block-created" >/dev/sda1 +echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/sda1 poweroff -f diff --git a/test/TEST-02-SYSTEMD/test-init.sh b/test/TEST-02-SYSTEMD/test-init.sh index 63fd58f7f..66bd1c3ad 100755 --- a/test/TEST-02-SYSTEMD/test-init.sh +++ b/test/TEST-02-SYSTEMD/test-init.sh @@ -102,7 +102,7 @@ strstr() { [ "${1##*"$2"*}" != "$1" ]; } plymouth --quit exec /dev/console 2>&1 -echo "dracut-root-block-success" >/dev/sda1 +echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sda1 export TERM=linux export PS1='initramfs-test:\w\$ ' [ -f /etc/mtab ] || ln -sfn /proc/mounts /etc/mtab diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh index a08bfe5ce..cf1fcaa52 100755 --- a/test/TEST-02-SYSTEMD/test.sh +++ b/test/TEST-02-SYSTEMD/test.sh @@ -35,7 +35,7 @@ test_setup() { ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ mount dmesg dhclient mkdir cp ping dhclient \ - umount strace less setsid systemd-analyze + umount strace less setsid systemd-analyze dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -54,7 +54,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mkfs.ext3 poweroff cp umount + inst_multiple sfdisk mkfs.ext3 poweroff cp umount dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules @@ -82,7 +82,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple poweroff shutdown + inst_multiple poweroff shutdown dd inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook pre-pivot 000 ./systemd-analyze.sh inst_hook emergency 000 ./hard-off.sh diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-03-USR-MOUNT/create-root.sh index 478d5ef4d..238fad06a 100755 --- a/test/TEST-03-USR-MOUNT/create-root.sh +++ b/test/TEST-03-USR-MOUNT/create-root.sh @@ -37,7 +37,7 @@ btrfs filesystem sync /root/usr btrfs filesystem sync /root umount /root/usr umount /root -echo "dracut-root-block-created" >/dev/sda1 +echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/sda1 udevadm settle sync poweroff -f diff --git a/test/TEST-03-USR-MOUNT/test-init.sh b/test/TEST-03-USR-MOUNT/test-init.sh index dc03359a5..d49372f68 100755 --- a/test/TEST-03-USR-MOUNT/test-init.sh +++ b/test/TEST-03-USR-MOUNT/test-init.sh @@ -109,7 +109,7 @@ ismounted() { } if ismounted /usr; then - echo "dracut-root-block-success" >/dev/sdc + echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sdc fi export TERM=linux export PS1='initramfs-test:\w\$ ' diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh index 5943c5c60..cdf71838e 100755 --- a/test/TEST-03-USR-MOUNT/test.sh +++ b/test/TEST-03-USR-MOUNT/test.sh @@ -65,7 +65,7 @@ test_setup() { ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ mount dmesg dhclient mkdir cp ping dhclient \ - umount strace less setsid + umount strace less setsid dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -85,7 +85,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mkfs.btrfs btrfs poweroff cp umount sync + inst_multiple sfdisk mkfs.btrfs btrfs poweroff cp umount sync dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules @@ -122,7 +122,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple poweroff shutdown + 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 diff --git a/test/TEST-04-FULL-SYSTEMD/create-root.sh b/test/TEST-04-FULL-SYSTEMD/create-root.sh index a9f5ac522..d89c64943 100755 --- a/test/TEST-04-FULL-SYSTEMD/create-root.sh +++ b/test/TEST-04-FULL-SYSTEMD/create-root.sh @@ -38,7 +38,7 @@ btrfs filesystem sync /root/usr btrfs filesystem sync /root umount /root/usr umount /root -echo "dracut-root-block-created" >/dev/sda1 +echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/sda1 sync poweroff -f diff --git a/test/TEST-04-FULL-SYSTEMD/test-init.sh b/test/TEST-04-FULL-SYSTEMD/test-init.sh index e40f5e6f3..687522b90 100755 --- a/test/TEST-04-FULL-SYSTEMD/test-init.sh +++ b/test/TEST-04-FULL-SYSTEMD/test-init.sh @@ -111,7 +111,7 @@ ismounted() { systemctl --failed --no-legend --no-pager > /failed if ismounted /usr && [ ! -s /failed ]; then - echo "dracut-root-block-success" >/dev/sdc + echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sdc fi if ! ismounted /usr; then diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh index 4114070a3..a7b996000 100755 --- a/test/TEST-04-FULL-SYSTEMD/test.sh +++ b/test/TEST-04-FULL-SYSTEMD/test.sh @@ -69,7 +69,7 @@ test_setup() { ln -sfn /run/lock "$initdir/var/lock" inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg mkdir cp ping \ + mount dmesg mkdir cp ping dd \ umount strace less setsid tree systemctl reset for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do @@ -227,7 +227,7 @@ EOF ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mkfs.btrfs btrfs poweroff cp umount sync + inst_multiple sfdisk mkfs.btrfs btrfs poweroff cp umount sync dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules @@ -260,7 +260,7 @@ EOF ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple poweroff shutdown + 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 diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh index af4cac0d9..e7bb3ef9e 100755 --- a/test/TEST-10-RAID/create-root.sh +++ b/test/TEST-10-RAID/create-root.sh @@ -36,5 +36,5 @@ udevadm settle cryptsetup luksClose /dev/mapper/dracut_crypt_test udevadm settle eval $(udevadm info --query=env --name=/dev/md0|while read line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo $line; done;) -{ echo "dracut-root-block-created"; echo "ID_FS_UUID=$ID_FS_UUID"; } >/dev/sda1 +{ echo "dracut-root-block-created"; echo "ID_FS_UUID=$ID_FS_UUID"; } | dd oflag=direct,dsync of=/dev/sda1 poweroff -f diff --git a/test/TEST-10-RAID/test-init.sh b/test/TEST-10-RAID/test-init.sh index 5ca9de15b..1d9c9a886 100755 --- a/test/TEST-10-RAID/test-init.sh +++ b/test/TEST-10-RAID/test-init.sh @@ -99,7 +99,7 @@ strstr() { [ "${1##*"$2"*}" != "$1" ]; } CMDLINE=$(while read line || [ -n "$line" ]; do echo $line;done < /proc/cmdline) command -v plymouth >/dev/null && plymouth --quit exec >/dev/console 2>&1 -echo "dracut-root-block-success" >/dev/sda1 +echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sda1 export TERM=linux export PS1='initramfs-test:\w\$ ' [ -f /etc/mtab ] || ln -sfn /proc/mounts /etc/mtab diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index fd92606b4..981c1b9d4 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -35,7 +35,7 @@ test_setup() { done ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient + mount dmesg dhclient mkdir cp ping dhclient dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -55,7 +55,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mke2fs poweroff cp umount + inst_multiple sfdisk mke2fs poweroff cp umount dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules @@ -82,7 +82,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple poweroff shutdown + inst_multiple poweroff shutdown dd inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh inst ./cryptroot-ask.sh /sbin/cryptroot-ask diff --git a/test/TEST-11-LVM/create-root.sh b/test/TEST-11-LVM/create-root.sh index 5d7443fd2..7fbef295e 100755 --- a/test/TEST-11-LVM/create-root.sh +++ b/test/TEST-11-LVM/create-root.sh @@ -27,5 +27,5 @@ umount /sysroot && \ sleep 1 && \ lvm lvchange -a n /dev/dracut/root && \ sleep 1 && \ -echo "dracut-root-block-created" >/dev/sda1 +echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/sda1 poweroff -f diff --git a/test/TEST-11-LVM/test-init.sh b/test/TEST-11-LVM/test-init.sh index 00d9da777..975bfece3 100755 --- a/test/TEST-11-LVM/test-init.sh +++ b/test/TEST-11-LVM/test-init.sh @@ -99,7 +99,7 @@ strstr() { [ "${1##*"$2"*}" != "$1" ]; } CMDLINE=$(while read line || [ -n "$line" ]; do echo $line;done < /proc/cmdline) plymouth --quit exec >/dev/console 2>&1 -echo "dracut-root-block-success" >/dev/sda1 +echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sda1 export TERM=linux export PS1='initramfs-test:\w\$ ' [ -f /etc/mtab ] || ln -sfn /proc/mounts /etc/mtab diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh index 95463e4b8..c718ad57d 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -33,7 +33,7 @@ test_setup() { mkdir -p -- var/lib/nfs/rpc_pipefs ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient + mount dmesg dhclient mkdir cp ping dhclient dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -53,7 +53,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mke2fs poweroff cp umount + inst_multiple sfdisk mke2fs poweroff cp umount dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules @@ -76,7 +76,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple poweroff shutdown + 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 diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh index df4f619da..31be41d14 100755 --- a/test/TEST-12-RAID-DEG/create-root.sh +++ b/test/TEST-12-RAID-DEG/create-root.sh @@ -45,4 +45,4 @@ mdadm -W /dev/md0 || : mdadm --detail --export /dev/md0 |grep -F MD_UUID > /tmp/mduuid . /tmp/mduuid eval $(udevadm info --query=env --name=/dev/md0|while read line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo $line; done;) -{ echo "dracut-root-block-created"; echo MD_UUID=$MD_UUID; echo "ID_FS_UUID=$ID_FS_UUID";} > /dev/sda1 +{ echo "dracut-root-block-created"; echo MD_UUID=$MD_UUID; echo "ID_FS_UUID=$ID_FS_UUID";} | dd oflag=direct,dsync of=/dev/sda1 diff --git a/test/TEST-12-RAID-DEG/test-init.sh b/test/TEST-12-RAID-DEG/test-init.sh index 5ca9de15b..1d9c9a886 100755 --- a/test/TEST-12-RAID-DEG/test-init.sh +++ b/test/TEST-12-RAID-DEG/test-init.sh @@ -99,7 +99,7 @@ strstr() { [ "${1##*"$2"*}" != "$1" ]; } CMDLINE=$(while read line || [ -n "$line" ]; do echo $line;done < /proc/cmdline) command -v plymouth >/dev/null && plymouth --quit exec >/dev/console 2>&1 -echo "dracut-root-block-success" >/dev/sda1 +echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sda1 export TERM=linux export PS1='initramfs-test:\w\$ ' [ -f /etc/mtab ] || ln -sfn /proc/mounts /etc/mtab diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index d6b29ddec..2f3d72a8a 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -75,7 +75,7 @@ test_setup() { done ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient + mount dmesg dhclient mkdir cp ping dhclient dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -126,7 +126,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple poweroff shutdown + 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 diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh index 13e65838d..437f0fb29 100755 --- a/test/TEST-13-ENC-RAID-LVM/create-root.sh +++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh @@ -51,5 +51,5 @@ cryptsetup luksClose /dev/mapper/dracut_sda4 && \ for i in /dev/sda[234]; do udevadm info --query=env --name=$i|grep -F 'ID_FS_UUID=' done -} >/dev/sda1 +} | dd oflag=direct,dsync of=/dev/sda1 poweroff -f diff --git a/test/TEST-13-ENC-RAID-LVM/test-init.sh b/test/TEST-13-ENC-RAID-LVM/test-init.sh index 6b86561fb..07d245a73 100755 --- a/test/TEST-13-ENC-RAID-LVM/test-init.sh +++ b/test/TEST-13-ENC-RAID-LVM/test-init.sh @@ -1,7 +1,7 @@ #!/bin/sh export PATH=/sbin:/bin:/usr/sbin:/usr/bin exec >/dev/console 2>&1 -echo "dracut-root-block-success" >/dev/sdb +echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sdb export TERM=linux export PS1='initramfs-test:\w\$ ' [ -f /etc/fstab ] || ln -s /proc/mounts /etc/fstab diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh index 1f311be52..580ade85e 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -67,7 +67,7 @@ test_setup() { mkdir -p -- var/lib/nfs/rpc_pipefs ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient + mount dmesg dhclient mkdir cp ping dhclient dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -86,7 +86,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mke2fs poweroff cp umount grep + inst_multiple sfdisk mke2fs poweroff cp umount grep dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules @@ -116,7 +116,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple poweroff shutdown + 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 diff --git a/test/TEST-14-IMSM/create-root.sh b/test/TEST-14-IMSM/create-root.sh index 0d10945b1..9b6517fb8 100755 --- a/test/TEST-14-IMSM/create-root.sh +++ b/test/TEST-14-IMSM/create-root.sh @@ -73,5 +73,5 @@ udevadm settle mdadm --detail --export /dev/md0 |grep -F MD_UUID > /tmp/mduuid . /tmp/mduuid echo "MD_UUID=$MD_UUID" -{ echo "dracut-root-block-created"; echo MD_UUID=$MD_UUID;} > /dev/sda +{ echo "dracut-root-block-created"; echo MD_UUID=$MD_UUID;} | dd oflag=direct,dsync of=/dev/sda mdadm --wait-clean /dev/md0 diff --git a/test/TEST-14-IMSM/test-init.sh b/test/TEST-14-IMSM/test-init.sh index 01cbe961e..d82657ad2 100755 --- a/test/TEST-14-IMSM/test-init.sh +++ b/test/TEST-14-IMSM/test-init.sh @@ -99,7 +99,7 @@ strstr() { [ "${1##*"$2"*}" != "$1" ]; } CMDLINE=$(while read line || [ -n "$line" ]; do echo $line;done < /proc/cmdline) plymouth --quit exec >/dev/console 2>&1 -echo "dracut-root-block-success" >/dev/sda +echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sda export TERM=linux export PS1='initramfs-test:\w\$ ' cat /proc/mdstat diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh index 75ea587f8..51c26e817 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -67,7 +67,7 @@ test_setup() { done ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient + mount dmesg dhclient mkdir cp ping dhclient dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -87,7 +87,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mke2fs poweroff cp umount grep + inst_multiple sfdisk mke2fs poweroff cp umount grep dd inst_hook initqueue 01 ./create-root.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules ) diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh index e95e57da8..4d0bf2eb2 100755 --- a/test/TEST-15-BTRFSRAID/create-root.sh +++ b/test/TEST-15-BTRFSRAID/create-root.sh @@ -23,5 +23,5 @@ mkdir -p /sysroot mount -t btrfs /dev/sda5 /sysroot cp -a -t /sysroot /source/* umount /sysroot -echo "dracut-root-block-created" >/dev/sda1 +echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/sda1 poweroff -f diff --git a/test/TEST-15-BTRFSRAID/test-init.sh b/test/TEST-15-BTRFSRAID/test-init.sh index ed66a2b35..563287277 100755 --- a/test/TEST-15-BTRFSRAID/test-init.sh +++ b/test/TEST-15-BTRFSRAID/test-init.sh @@ -1,7 +1,7 @@ #!/bin/sh export PATH=/sbin:/bin:/usr/sbin:/usr/bin exec >/dev/console 2>&1 -echo "dracut-root-block-success" >/dev/sda +echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sda sync export TERM=linux export PS1='initramfs-test:\w\$ ' diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh index 873b779a7..435e52be2 100755 --- a/test/TEST-15-BTRFSRAID/test.sh +++ b/test/TEST-15-BTRFSRAID/test.sh @@ -38,7 +38,7 @@ test_setup() { mkdir -p -- var/lib/nfs/rpc_pipefs ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient sync + mount dmesg dhclient mkdir cp ping dhclient sync dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -57,7 +57,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mkfs.btrfs poweroff cp umount + inst_multiple sfdisk mkfs.btrfs poweroff cp umount dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-16-DMSQUASH/test-init.sh b/test/TEST-16-DMSQUASH/test-init.sh index 3a93c8023..4a9c814b8 100755 --- a/test/TEST-16-DMSQUASH/test-init.sh +++ b/test/TEST-16-DMSQUASH/test-init.sh @@ -99,7 +99,7 @@ strstr() { [ "${1##*"$2"*}" != "$1" ]; } CMDLINE=$(while read line || [ -n "$line" ]; do echo $line;done < /proc/cmdline) plymouth --quit exec >/dev/console 2>&1 -echo "dracut-root-block-success" >/dev/sdb +echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sdb export TERM=linux export PS1='initramfs-test:\w\$ ' [ -f /etc/mtab ] || ln -sfn /proc/mounts /etc/mtab diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh index 37a963e2b..def97e271 100755 --- a/test/TEST-16-DMSQUASH/test.sh +++ b/test/TEST-16-DMSQUASH/test.sh @@ -73,7 +73,7 @@ test_setup() { ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ mount dmesg dhclient mkdir cp ping dhclient \ - umount strace less + umount strace less dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [[ -f ${_terminfodir}/l/linux ]] && break done diff --git a/test/TEST-17-LVM-THIN/create-root.sh b/test/TEST-17-LVM-THIN/create-root.sh index 6e09012e2..01f0a1191 100755 --- a/test/TEST-17-LVM-THIN/create-root.sh +++ b/test/TEST-17-LVM-THIN/create-root.sh @@ -29,5 +29,5 @@ sleep 1 && \ lvm lvchange -a n /dev/dracut/root && \ sleep 1 dmsetup status |grep out_of_data_space || \ - echo "dracut-root-block-created" >/dev/sda1 + echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/sda1 poweroff -f diff --git a/test/TEST-17-LVM-THIN/test-init.sh b/test/TEST-17-LVM-THIN/test-init.sh index cb9d921d6..ef867ab92 100755 --- a/test/TEST-17-LVM-THIN/test-init.sh +++ b/test/TEST-17-LVM-THIN/test-init.sh @@ -99,7 +99,7 @@ strstr() { [ "${1##*"$2"*}" != "$1" ]; } CMDLINE=$(while read line || [ -n "$line" ]; do echo $line;done < /proc/cmdline) plymouth --quit exec >/dev/console 2>&1 -echo "dracut-root-block-success" >/dev/sda1 +echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sda1 export TERM=linux export PS1='initramfs-test:\w\$ ' [ -f /etc/mtab ] || ln -sfn /proc/mounts /etc/mtab diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh index fb7b817c3..e4755f788 100755 --- a/test/TEST-17-LVM-THIN/test.sh +++ b/test/TEST-17-LVM-THIN/test.sh @@ -33,7 +33,7 @@ test_setup() { mkdir -p -- var/lib/nfs/rpc_pipefs ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient + mount dmesg dhclient mkdir cp ping dhclient dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -53,7 +53,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mke2fs poweroff cp umount grep dmsetup + inst_multiple sfdisk mke2fs poweroff cp umount grep dmsetup dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-20-NFS/client-init.sh b/test/TEST-20-NFS/client-init.sh index 55762d1ee..127555a99 100755 --- a/test/TEST-20-NFS/client-init.sh +++ b/test/TEST-20-NFS/client-init.sh @@ -112,7 +112,7 @@ echo "made it to the rootfs! Powering down." while read dev fs fstype opts rest || [ -n "$dev" ]; do [ "$fstype" != "nfs" -a "$fstype" != "nfs4" ] && continue - echo "nfs-OK $dev $fstype $opts" > /dev/sda + echo "nfs-OK $dev $fstype $opts" | dd oflag=direct,dsync of=/dev/sda break done < /proc/mounts >/dev/watchdog diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 27c90d5e8..9d5493c72 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -305,7 +305,7 @@ test_setup() { export initdir=$TESTDIR/mnt/nfs/client . $basedir/dracut-init.sh - inst_multiple sh shutdown poweroff stty cat ps ln ip \ + inst_multiple sh shutdown poweroff stty cat ps ln ip dd \ mount dmesg mkdir cp ping grep setsid ls vi /etc/virc less cat for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break diff --git a/test/TEST-30-ISCSI/client-init.sh b/test/TEST-30-ISCSI/client-init.sh index 7a5b7546d..a659f148e 100755 --- a/test/TEST-30-ISCSI/client-init.sh +++ b/test/TEST-30-ISCSI/client-init.sh @@ -104,7 +104,7 @@ stty sane echo "made it to the rootfs! Powering down." while read dev fs fstype opts rest || [ -n "$dev" ]; do [ "$fstype" != "ext3" ] && continue - echo "iscsi-OK $dev $fstype $opts" > /dev/sda + echo "iscsi-OK $dev $fstype $opts" | dd oflag=direct,dsync of=/dev/sda break done < /proc/mounts #sh -i diff --git a/test/TEST-30-ISCSI/create-root.sh b/test/TEST-30-ISCSI/create-root.sh index 5f4b32a2c..d44c35762 100755 --- a/test/TEST-30-ISCSI/create-root.sh +++ b/test/TEST-30-ISCSI/create-root.sh @@ -21,5 +21,5 @@ mount /dev/dracut/root /sysroot && \ cp -a -t /sysroot /source/* && \ umount /sysroot && \ lvm lvchange -a n /dev/dracut/root && \ -echo "dracut-root-block-created" >/dev/sdb +echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/sdb poweroff -f diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index 8c7e94527..a8aee2211 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -149,7 +149,7 @@ test_setup() { mkdir -p -- var/lib/nfs/rpc_pipefs ) inst_multiple sh shutdown poweroff stty cat ps ln ip \ - mount dmesg mkdir cp ping grep setsid + mount dmesg mkdir cp ping grep setsid dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -164,7 +164,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mkfs.ext3 poweroff cp umount setsid + inst_multiple sfdisk mkfs.ext3 poweroff cp umount setsid dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-35-ISCSI-MULTI/client-init.sh b/test/TEST-35-ISCSI-MULTI/client-init.sh index 7a5b7546d..a659f148e 100755 --- a/test/TEST-35-ISCSI-MULTI/client-init.sh +++ b/test/TEST-35-ISCSI-MULTI/client-init.sh @@ -104,7 +104,7 @@ stty sane echo "made it to the rootfs! Powering down." while read dev fs fstype opts rest || [ -n "$dev" ]; do [ "$fstype" != "ext3" ] && continue - echo "iscsi-OK $dev $fstype $opts" > /dev/sda + echo "iscsi-OK $dev $fstype $opts" | dd oflag=direct,dsync of=/dev/sda break done < /proc/mounts #sh -i diff --git a/test/TEST-35-ISCSI-MULTI/create-root.sh b/test/TEST-35-ISCSI-MULTI/create-root.sh index 5f4b32a2c..d44c35762 100755 --- a/test/TEST-35-ISCSI-MULTI/create-root.sh +++ b/test/TEST-35-ISCSI-MULTI/create-root.sh @@ -21,5 +21,5 @@ mount /dev/dracut/root /sysroot && \ cp -a -t /sysroot /source/* && \ umount /sysroot && \ lvm lvchange -a n /dev/dracut/root && \ -echo "dracut-root-block-created" >/dev/sdb +echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/sdb poweroff -f diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh index 0c40e55c7..e96c9c566 100755 --- a/test/TEST-35-ISCSI-MULTI/test.sh +++ b/test/TEST-35-ISCSI-MULTI/test.sh @@ -164,7 +164,7 @@ test_setup() { mkdir -p -- var/lib/nfs/rpc_pipefs ) inst_multiple sh shutdown poweroff stty cat ps ln ip \ - mount dmesg mkdir cp ping grep setsid + mount dmesg mkdir cp ping grep setsid dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -179,7 +179,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple sfdisk mkfs.ext3 poweroff cp umount setsid + inst_multiple sfdisk mkfs.ext3 poweroff cp umount setsid dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-40-NBD/client-init.sh b/test/TEST-40-NBD/client-init.sh index 2b42e21b5..6292501ab 100755 --- a/test/TEST-40-NBD/client-init.sh +++ b/test/TEST-40-NBD/client-init.sh @@ -5,7 +5,7 @@ exec >/dev/console 2>&1 while read dev fs fstype opts rest || [ -n "$dev" ]; do [ "$dev" = "rootfs" ] && continue [ "$fs" != "/" ] && continue - echo "nbd-OK $fstype $opts" >/dev/sda + echo "nbd-OK $fstype $opts" | dd oflag=direct,dsync of=/dev/sda echo "nbd-OK $fstype $opts" break done < /proc/mounts diff --git a/test/TEST-40-NBD/create-root.sh b/test/TEST-40-NBD/create-root.sh index 20d0effd9..c57bf7f4f 100755 --- a/test/TEST-40-NBD/create-root.sh +++ b/test/TEST-40-NBD/create-root.sh @@ -26,5 +26,5 @@ cryptsetup luksClose /dev/mapper/dracut_crypt_test udevadm settle sleep 1 eval $(udevadm info --query=env --name=/dev/sdb|while read line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo $line; done;) -{ echo "dracut-root-block-created"; echo "ID_FS_UUID=$ID_FS_UUID"; } >/dev/sda +{ echo "dracut-root-block-created"; echo "ID_FS_UUID=$ID_FS_UUID"; } | dd oflag=direct,dsync of=/dev/sda poweroff -f diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index 75820cbb7..f06c36c3e 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -227,7 +227,7 @@ make_encrypted_root() { ln -s ../run var/run ) inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg mkdir cp ping + mount dmesg mkdir cp ping dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -251,7 +251,7 @@ make_encrypted_root() { done ln -s ../run var/run ) - inst_multiple mke2fs poweroff cp umount tune2fs + inst_multiple mke2fs poweroff cp umount tune2fs dd inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh inst_hook initqueue 01 ./create-root.sh @@ -302,7 +302,7 @@ make_client_root() { ln -s ../run var/run ) inst_multiple sh ls shutdown poweroff stty cat ps ln ip \ - dmesg mkdir cp ping + dmesg mkdir cp ping dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -390,7 +390,7 @@ test_setup() { ( export initdir=$TESTDIR/overlay . $basedir/dracut-init.sh - inst_multiple poweroff shutdown + 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 inst ./cryptroot-ask.sh /sbin/cryptroot-ask diff --git a/test/TEST-50-MULTINIC/client-init.sh b/test/TEST-50-MULTINIC/client-init.sh index 518f00fcb..38879049c 100755 --- a/test/TEST-50-MULTINIC/client-init.sh +++ b/test/TEST-50-MULTINIC/client-init.sh @@ -124,7 +124,7 @@ done { echo "OK" echo "$IFACES" -} > /dev/sda +} | dd oflag=direct,dsync of=/dev/sda getargbool 0 rd.shell && sh -i poweroff -f diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index 14f6b6b76..b4326d5af 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -257,7 +257,7 @@ test_setup() { done ) inst_multiple sh shutdown poweroff stty cat ps ln ip \ - mount dmesg mkdir cp ping grep ls + mount dmesg mkdir cp ping grep ls dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [[ -f ${_terminfodir}/l/linux ]] && break done diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh index 269355576..13cef7ffa 100755 --- a/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh +++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh @@ -16,7 +16,7 @@ echo "made it to the rootfs! Powering down." grep -v 'UUID=' $i done echo EOF -) > /dev/sda +) | dd oflag=direct,dsync of=/dev/sda strstr "$CMDLINE" "rd.shell" && sh -i poweroff -f diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh index 859b279e6..72826a5da 100755 --- a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh +++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh @@ -274,7 +274,7 @@ test_setup() { export initdir="$TESTDIR"/mnt/nfs/client . "$basedir"/dracut-init.sh inst_multiple sh shutdown poweroff stty cat ps ln ip \ - mount dmesg mkdir cp ping grep ls sort + mount dmesg mkdir cp ping grep ls sort dd for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [[ -f ${_terminfodir}/l/linux ]] && break done -- 2.39.2