Fix tests with network-legacy
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 455afef..ed2ae5d 100755
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -46,8 +46,8 @@
[ -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 692d578..8c5eb16 100755
--- a/test/TEST-02-SYSTEMD/test.sh
+++ b/test/TEST-02-SYSTEMD/test.sh
@@ -43,8 +43,8 @@
[ -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 1e6bd42..42c0da6 100755
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -73,8 +73,8 @@
[ -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 10a4711..97528e4 100755
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -79,8 +79,8 @@
[ -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 585d507..444126b 100755
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -45,8 +45,8 @@
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 7c536df..5c105e0 100755
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -41,8 +41,8 @@
[ -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 4097c81..4e381d8 100755
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -82,8 +82,8 @@
[ -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 ac6a7ca..76ec36b 100755
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -81,8 +81,8 @@
[ -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 2117235..8ebc285 100755
--- a/test/TEST-14-IMSM/test.sh
+++ b/test/TEST-14-IMSM/test.sh
@@ -76,8 +76,8 @@
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 092ed25..02cb497 100755
--- a/test/TEST-15-BTRFSRAID/test.sh
+++ b/test/TEST-15-BTRFSRAID/test.sh
@@ -46,8 +46,8 @@
[ -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 f48e22d..45d8c4c 100755
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
@@ -78,8 +78,8 @@
[[ -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 b3ca25f..af34924 100755
--- a/test/TEST-17-LVM-THIN/test.sh
+++ b/test/TEST-17-LVM-THIN/test.sh
@@ -41,8 +41,8 @@
[ -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
