From: Laszlo Gombos Date: Wed, 17 Aug 2022 04:23:08 +0000 (+0000) Subject: test: do not bring up the network interface if it is not needed X-Git-Tag: 058~141 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31c4aac32dfff6d2e8911974d6a272bbfa90c19b;p=thirdparty%2Fdracut.git test: do not bring up the network interface if it is not needed Notice that TEST-04 does not explicitelly includes dhclient and dhclient-script for the rootfs. Apply the same principle for all local tests that do not need networking. This should make the tests run faster and slightly more reliable. This change also brings us to a better place where network-legacy files are only gets included via proper dracut module inclusion. --- diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 390089b6e..38f3ab205 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -38,15 +38,13 @@ test_setup() { mkdir -p -- dev sys proc etc var/run tmp mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin ) - inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient \ + inst_multiple sh df free ls shutdown poweroff stty cat ps ln \ + mount dmesg mkdir cp \ umount strace less setsid 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_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh index 6e5311c95..796f74873 100755 --- a/test/TEST-02-SYSTEMD/test.sh +++ b/test/TEST-02-SYSTEMD/test.sh @@ -36,15 +36,13 @@ test_setup() { mkdir -p -- dev sys proc etc var/run tmp mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin ) - inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient \ + inst_multiple sh df free ls shutdown poweroff stty cat ps ln \ + mount dmesg mkdir cp \ umount strace less setsid systemd-analyze 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_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh index ccdc40c14..ae757d8fb 100755 --- a/test/TEST-03-USR-MOUNT/test.sh +++ b/test/TEST-03-USR-MOUNT/test.sh @@ -58,15 +58,13 @@ test_setup() { mkdir -p -- dev sys proc etc var/run tmp mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin ) - inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient \ + inst_multiple sh df free ls shutdown poweroff stty cat ps ln \ + mount dmesg mkdir cp \ umount strace less setsid 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_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index 3da394dc1..494dbcc26 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -38,8 +38,8 @@ test_setup() { mkdir -p -- dev sys proc etc var/run tmp mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin ) - inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient dd sync + inst_multiple sh df free ls shutdown poweroff stty cat ps ln \ + mount dmesg mkdir cp dd sync for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do [ -f ${_terminfodir}/l/linux ] && break done @@ -53,8 +53,6 @@ test_setup() { inst_simple /etc/os-release inst ./test-init.sh /sbin/init - inst "$basedir/modules.d/35network-legacy/dhclient-script.sh" "/sbin/dhclient-script" - inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup" inst_multiple grep inst_multiple -o /lib/systemd/systemd-shutdown find_binary plymouth > /dev/null && inst_multiple plymouth diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh index 380748134..b3ec547bd 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -39,14 +39,12 @@ test_setup() { mkdir -p -- dev sys proc etc var/run tmp mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin ) - inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient dd sync + inst_multiple sh df free ls shutdown poweroff stty cat ps ln \ + mount dmesg mkdir cp 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_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index 9a6da89c0..a41f721e1 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -70,14 +70,12 @@ test_setup() { mkdir -p -- dev sys proc etc var/run tmp mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin ) - inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient dd sync + inst_multiple sh df free ls shutdown poweroff stty cat ps ln \ + mount dmesg mkdir cp 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_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh index e0f1ce4ea..982aede19 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -67,14 +67,12 @@ test_setup() { mkdir -p -- dev sys proc etc var/run tmp mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin ) - inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient dd + inst_multiple sh df free ls shutdown poweroff stty cat ps ln \ + mount dmesg mkdir cp dd 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_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh index 8a097279f..f089e25bf 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -64,15 +64,13 @@ test_setup() { mkdir -p -- dev sys proc etc var/run tmp mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin ) - inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient dd sync + inst_multiple sh df free ls shutdown poweroff stty cat ps ln \ + mount dmesg mkdir cp 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_simple /etc/os-release - 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_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh index 8d1075a49..6d1ecb6ab 100755 --- a/test/TEST-15-BTRFSRAID/test.sh +++ b/test/TEST-15-BTRFSRAID/test.sh @@ -42,14 +42,12 @@ test_setup() { mkdir -p -- dev sys proc etc var/run tmp mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin ) - inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient sync dd + inst_multiple sh df free ls shutdown poweroff stty cat ps ln \ + mount dmesg mkdir cp sync dd 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_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh index 13730b74d..a9e2cb630 100755 --- a/test/TEST-17-LVM-THIN/test.sh +++ b/test/TEST-17-LVM-THIN/test.sh @@ -37,14 +37,12 @@ test_setup() { mkdir -p -- dev sys proc etc var/run tmp mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin ) - inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg dhclient mkdir cp ping dhclient dd sync + inst_multiple sh df free ls shutdown poweroff stty cat ps ln \ + mount dmesg mkdir cp 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_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"