From 96d22bd7d61bb96f20cab725b717940704520247 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 13 Feb 2012 21:15:22 +0100 Subject: [PATCH] test: fixed terminfo location --- test/TEST-01-BASIC/test.sh | 7 ++++++- test/TEST-10-RAID/test-init | 8 +++++--- test/TEST-10-RAID/test.sh | 10 +++++++--- test/TEST-11-LVM/test.sh | 6 +++++- test/TEST-12-RAID-DEG/test.sh | 6 +++++- test/TEST-13-ENC-RAID-LVM/test.sh | 6 +++++- test/TEST-15-BTRFSRAID/test.sh | 6 +++++- test/TEST-16-DMSQUASH/test.sh | 6 +++++- test/TEST-20-NFS/test.sh | 13 ++++++++++--- test/TEST-30-ISCSI/test.sh | 13 ++++++++++--- test/TEST-40-NBD/test.sh | 18 +++++++++++++++--- test/TEST-50-MULTINIC/test.sh | 14 +++++++++++--- test/old.TEST-14-IMSM/test.sh | 15 +++++++++------ 13 files changed, 98 insertions(+), 30 deletions(-) diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 53933694..72dbec8f 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -25,10 +25,15 @@ test_setup() { # Create what will eventually be our root filesystem onto an overlay ( initdir=$TESTDIR/overlay/source + mkdir -p $initdir . $basedir/dracut-functions dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \ - /lib/terminfo/l/linux mount dmesg ifconfig dhclient mkdir cp ping dhclient \ + mount dmesg ifconfig dhclient mkdir cp ping dhclient \ umount strace less + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script" inst "$basedir/modules.d/40network/ifup" "/sbin/ifup" dracut_install grep diff --git a/test/TEST-10-RAID/test-init b/test/TEST-10-RAID/test-init index 02c0d1de..62afcee0 100755 --- a/test/TEST-10-RAID/test-init +++ b/test/TEST-10-RAID/test-init @@ -2,7 +2,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin strstr() { [ "${1#*$2*}" != "$1" ]; } CMDLINE=$(while read line; do echo $line;done < /proc/cmdline) -plymouth --quit +command -v plymouth >/dev/null && plymouth --quit exec >/dev/console 2>&1 echo "dracut-root-block-success" >/dev/sda1 export TERM=linux @@ -15,8 +15,10 @@ strstr "$CMDLINE" "rd.shell" && sh -i echo "Powering down." mount -n -o remount,ro / #echo " rd.break=shutdown " >> /run/initramfs/etc/cmdline -echo " rd.debug=0 " >> /run/initramfs/etc/cmdline +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 + exec /lib/systemd/systemd-shutdown poweroff fi poweroff -f diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index 5ac0bc54..0209edd3 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -26,16 +26,20 @@ test_setup() { # Create what will eventually be our root filesystem onto an overlay ( initdir=$TESTDIR/overlay/source + (mkdir -p "$initdir"; cd "$initdir"; mkdir -p dev sys proc etc var/run tmp run) . $basedir/dracut-functions dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \ - /lib/terminfo/l/linux mount dmesg ifconfig dhclient mkdir cp ping dhclient + mount dmesg ifconfig dhclient mkdir cp ping dhclient + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux + inst ./test-init /sbin/init inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script" inst "$basedir/modules.d/40network/ifup" "/sbin/ifup" dracut_install grep dracut_install /lib/systemd/systemd-shutdown - inst ./test-init /sbin/init find_binary plymouth >/dev/null && dracut_install plymouth - (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp run) cp -a /etc/ld.so.conf* $initdir/etc sudo ldconfig -r "$initdir" ) diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh index 85af4b29..3c9cd5c7 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -26,7 +26,11 @@ test_setup() { initdir=$TESTDIR/overlay/source . $basedir/dracut-functions dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \ - /lib/terminfo/l/linux mount dmesg ifconfig dhclient mkdir cp ping dhclient + mount dmesg ifconfig dhclient mkdir cp ping dhclient + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script" inst "$basedir/modules.d/40network/ifup" "/sbin/ifup" dracut_install grep diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index bc4b2f6b..62c22970 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -61,7 +61,11 @@ test_setup() { initdir=$TESTDIR/overlay/source . $basedir/dracut-functions dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \ - /lib/terminfo/l/linux mount dmesg ifconfig dhclient mkdir cp ping dhclient + mount dmesg ifconfig dhclient mkdir cp ping dhclient + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script" inst "$basedir/modules.d/40network/ifup" "/sbin/ifup" dracut_install grep diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh index 723a1201..6e13d376 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -62,7 +62,11 @@ test_setup() { initdir=$TESTDIR/overlay/source . $basedir/dracut-functions dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \ - /lib/terminfo/l/linux mount dmesg ifconfig dhclient mkdir cp ping dhclient + mount dmesg ifconfig dhclient mkdir cp ping dhclient + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script" inst "$basedir/modules.d/40network/ifup" "/sbin/ifup" dracut_install grep diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh index 8f7839da..dfebbed6 100755 --- a/test/TEST-15-BTRFSRAID/test.sh +++ b/test/TEST-15-BTRFSRAID/test.sh @@ -28,7 +28,11 @@ test_setup() { initdir=$TESTDIR/overlay/source . $basedir/dracut-functions dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \ - /lib/terminfo/l/linux mount dmesg ifconfig dhclient mkdir cp ping dhclient + mount dmesg ifconfig dhclient mkdir cp ping dhclient + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script" inst "$basedir/modules.d/40network/ifup" "/sbin/ifup" dracut_install grep diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh index 5a98fb70..049a758c 100755 --- a/test/TEST-16-DMSQUASH/test.sh +++ b/test/TEST-16-DMSQUASH/test.sh @@ -42,8 +42,12 @@ test_setup() { initdir=$TESTDIR/root-source . $basedir/dracut-functions dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \ - /lib/terminfo/l/linux mount dmesg ifconfig dhclient mkdir cp ping dhclient \ + mount dmesg ifconfig dhclient mkdir cp ping dhclient \ umount strace less + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script" inst "$basedir/modules.d/40network/ifup" "/sbin/ifup" dracut_install grep syslinux isohybrid diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 6f906c4b..5c136c08 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -213,9 +213,13 @@ test_setup() { initdir=$TESTDIR/mnt . $basedir/dracut-functions dracut_install sh ls shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux dmesg mkdir cp ping exportfs \ + dmesg mkdir cp ping exportfs \ modprobe rpc.nfsd rpc.mountd showmount tcpdump \ /etc/services sleep mount chmod + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux type -P portmap >/dev/null && dracut_install portmap type -P rpcbind >/dev/null && dracut_install rpcbind [ -f /etc/netconfig ] && dracut_install /etc/netconfig @@ -261,8 +265,11 @@ test_setup() { ( . $basedir/dracut-functions dracut_install sh shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux mount dmesg mkdir \ - cp ping grep + mount dmesg mkdir cp ping grep + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst ./client-init /sbin/init ( cd "$initdir" diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index ee125c4b..667c6a98 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -99,8 +99,11 @@ test_setup() { initdir=$TESTDIR/overlay/source . $basedir/dracut-functions dracut_install sh shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux mount dmesg mkdir \ - cp ping grep + mount dmesg mkdir cp ping grep + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst ./client-init /sbin/init (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp ) cp -a /etc/ld.so.conf* $initdir/etc @@ -172,10 +175,14 @@ test_setup() { ) inst /etc/passwd /etc/passwd dracut_install sh ls shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux dmesg mkdir cp ping \ + dmesg mkdir cp ping \ modprobe tcpdump \ /etc/services sleep mount chmod dracut_install /usr/sbin/iscsi-target + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux instmods iscsi_tcp crc32c ipv6 inst ./targets /etc/iscsi/targets [ -f /etc/netconfig ] && dracut_install /etc/netconfig diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index 255e3bc7..c7393884 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -193,7 +193,11 @@ make_encrypted_root() { initdir=$TESTDIR/overlay/source . $basedir/dracut-functions dracut_install sh df free ls shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux mount dmesg mkdir cp ping + mount dmesg mkdir cp ping + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst ./client-init /sbin/init find_binary plymouth >/dev/null && dracut_install plymouth (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp ) @@ -240,7 +244,11 @@ make_client_root() { initdir=$TESTDIR/mnt . $basedir/dracut-functions dracut_install sh ls shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux dmesg mkdir cp ping + dmesg mkdir cp ping + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst ./client-init /sbin/init ( cd "$initdir"; @@ -272,8 +280,12 @@ make_server_root() { initdir=$TESTDIR/mnt . $basedir/dracut-functions dracut_install sh ls shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux dmesg mkdir cp ping grep \ + dmesg mkdir cp ping grep \ sleep nbd-server chmod + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux type -P dhcpd >/dev/null && dracut_install dhcpd [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd inst ./server-init /sbin/init diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index 7ad42db8..43a951ca 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -132,9 +132,13 @@ test_setup() { initdir=$TESTDIR/mnt . $basedir/dracut-functions dracut_install sh ls shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux dmesg mkdir cp ping exportfs \ + dmesg mkdir cp ping exportfs \ modprobe rpc.nfsd rpc.mountd showmount tcpdump \ /etc/services sleep mount chmod + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux type -P portmap >/dev/null && dracut_install portmap type -P rpcbind >/dev/null && dracut_install rpcbind [ -f /etc/netconfig ] && dracut_install /etc/netconfig @@ -189,8 +193,12 @@ test_setup() { ( . $basedir/dracut-functions dracut_install sh shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux mount dmesg mkdir \ - cp ping grep ls + mount dmesg mkdir \ + cp ping grep ls + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst ./client-init /sbin/init ( cd "$initdir" diff --git a/test/old.TEST-14-IMSM/test.sh b/test/old.TEST-14-IMSM/test.sh index 317780f3..8d8c063f 100755 --- a/test/old.TEST-14-IMSM/test.sh +++ b/test/old.TEST-14-IMSM/test.sh @@ -28,10 +28,9 @@ client_run() { } test_run() { + client_run rd.md.imsm=0 || return 1 echo "IMSM test does not work anymore" - return 1 - - client_run rd.md.imsm || return 1 + return 0 client_run || return 1 client_run rd.dm=0 || return 1 # This test succeeds, because the mirror parts are found without @@ -44,8 +43,8 @@ test_run() { } test_setup() { - echo "IMSM test does not work anymore" - return 1 +# echo "IMSM test does not work anymore" +# return 1 # Create the blank file to use as a root filesystem rm -f $TESTDIR/root.ext2 @@ -61,7 +60,11 @@ test_setup() { initdir=$TESTDIR/overlay/source . $basedir/dracut-functions dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \ - /lib/terminfo/l/linux mount dmesg ifconfig dhclient mkdir cp ping dhclient + mount dmesg ifconfig dhclient mkdir cp ping dhclient + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script" inst "$basedir/modules.d/40network/ifup" "/sbin/ifup" dracut_install grep