Fix tests with network-legacy

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 455afef6d85f0c4ee7b9a63ec6dd3f883780a870..ed2ae5dedbf61b6617feee56bd17346743b46d1b 100755 (executable)
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -46,8 +46,8 @@ test_setup() {
             [ -f ${_terminfodir}/l/linux ] && break
        done
        inst_multiple -o ${_terminfodir}/l/linux
-       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+       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_simple /etc/os-release
        inst ./test-init.sh /sbin/init

diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
index 692d578c47b6ab60a8b18b107de9ef08cb91bcd3..8c5eb168bc977a25d21ee98a3a5fe08a79e124f8 100755 (executable)
--- a/test/TEST-02-SYSTEMD/test.sh
+++ b/test/TEST-02-SYSTEMD/test.sh
@@ -43,8 +43,8 @@ test_setup() {
             [ -f ${_terminfodir}/l/linux ] && break
         done
         inst_multiple -o ${_terminfodir}/l/linux
-        inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-        inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+        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_simple /etc/os-release
         inst ./test-init.sh /sbin/init

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index 1e6bd422bf0d1eb4e543cad46b9265ddff4ced1d..42c0da65e5b948659ae6a51c4a7c8feff5418a6d 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -73,8 +73,8 @@ test_setup() {
             [ -f ${_terminfodir}/l/linux ] && break
        done
        inst_multiple -o ${_terminfodir}/l/linux
-       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+       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_simple ./fstab /etc/fstab
         inst_simple /etc/os-release

diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index 10a4711d387193bf84152d7e3472ff3040efa355..97528e4fb42109d899e8485f74c643d13c872fdc 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -79,8 +79,8 @@ test_setup() {
             [ -f ${_terminfodir}/l/linux ] && break
        done
        inst_multiple -o ${_terminfodir}/l/linux
-       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+       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_simple ./fstab /etc/fstab
         rpm -ql systemd | xargs -r $DRACUT_INSTALL ${initdir:+-D "$initdir"} -o -a -l

diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index 585d5074bdf3f1f8cc9bebbcbf4d237577abd29d..444126b289f6f4dea70c9fc7e9551dd84fdd1469 100755 (executable)
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -45,8 +45,8 @@ test_setup() {
        inst_multiple -o ${_terminfodir}/l/linux
         inst_simple /etc/os-release
        inst ./test-init.sh /sbin/init
-       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+       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 7c536df0ec4912a3f5505493ab25f7c2936b69fa..5c105e0121039567f1993f3c1e69f0046cbcf26f 100755 (executable)
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -41,8 +41,8 @@ test_setup() {
            [ -f ${_terminfodir}/l/linux ] && break
        done
        inst_multiple -o ${_terminfodir}/l/linux
-       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+       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_simple /etc/os-release
        inst ./test-init.sh /sbin/init

diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index 4097c8186dfdde2df37842aacd98a13277664edb..4e381d844226d5e0e3400cd2584812db05429c59 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -82,8 +82,8 @@ test_setup() {
             [ -f ${_terminfodir}/l/linux ] && break
         done
         inst_multiple -o ${_terminfodir}/l/linux
-        inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-        inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+        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_simple /etc/os-release
         inst ./test-init.sh /sbin/init

diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
index ac6a7caec5e057b46f30a3599518ca66a155fd48..76ec36b3750804400faa61b2fad617f8b4660407 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -81,8 +81,8 @@ test_setup() {
            [ -f ${_terminfodir}/l/linux ] && break
        done
        inst_multiple -o ${_terminfodir}/l/linux
-       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+       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_simple /etc/os-release
        inst ./test-init.sh /sbin/init

diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
index 211723578527d9491c099322c9eeaf7285835678..8ebc285a47f57ce73c7c51d8a1595fe7c26a0ac7 100755 (executable)
--- a/test/TEST-14-IMSM/test.sh
+++ b/test/TEST-14-IMSM/test.sh
@@ -76,8 +76,8 @@ test_setup() {
        done
        inst_multiple -o ${_terminfodir}/l/linux
        inst_simple /etc/os-release
-       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+       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 ./test-init.sh /sbin/init
        find_binary plymouth >/dev/null && inst_multiple plymouth

diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
index 092ed254e6b5e9b309fc06418eca48ccb2780d3f..02cb49765b2006457728525ca9cbe5279e36bc01 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/test.sh
+++ b/test/TEST-15-BTRFSRAID/test.sh
@@ -46,8 +46,8 @@ test_setup() {
            [ -f ${_terminfodir}/l/linux ] && break
        done
        inst_multiple -o ${_terminfodir}/l/linux
-       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+       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 ./test-init.sh /sbin/init
        inst_simple /etc/os-release

diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
index f48e22d1b2599600f1ae0c86fa9281aecd5b8837..45d8c4c05534561e847fcf8d48f0d6ff417f40b0 100755 (executable)
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
@@ -78,8 +78,8 @@ test_setup() {
            [[ -f ${_terminfodir}/l/linux ]] && break
        done
        inst_multiple -o "${_terminfodir}"/l/linux
-       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+       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 syslinux isohybrid
        for f in /usr/share/syslinux/*; do
            inst_simple "$f"

diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
index b3ca25f0dbf7eaa20a53fca630d22f86333ac004..af3492466558895580199a9185fffd754131a6a9 100755 (executable)
--- a/test/TEST-17-LVM-THIN/test.sh
+++ b/test/TEST-17-LVM-THIN/test.sh
@@ -41,8 +41,8 @@ test_setup() {
            [ -f ${_terminfodir}/l/linux ] && break
        done
        inst_multiple -o ${_terminfodir}/l/linux
-       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
+       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_simple /etc/os-release
        inst ./test-init.sh /sbin/init