test/*/test.sh: correct ifup and dhclient paths

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 6c39d7b..3023b6a 100755 (executable)
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -37,8 +37,8 @@ test_setup() {
             [ -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"
+       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
+       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
        dracut_install grep
        inst ./test-init.sh /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth

diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
index 334b636..9eefce2 100755 (executable)
--- a/test/TEST-02-SYSTEMD/test.sh
+++ b/test/TEST-02-SYSTEMD/test.sh
@@ -33,8 +33,8 @@ test_setup() {
             [ -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"
+       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
+       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
        dracut_install grep
        inst ./test-init.sh /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth

diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index 5ebd869..ef6d0c2 100755 (executable)
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -35,8 +35,8 @@ test_setup() {
        done
        dracut_install -o ${_terminfodir}/l/linux
        inst ./test-init.sh /sbin/init
-       inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup" "/sbin/ifup"
+       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
+       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
        dracut_install grep
        dracut_install /lib/systemd/systemd-shutdown
        find_binary plymouth >/dev/null && dracut_install plymouth

diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index 78468bb..034cc4c 100755 (executable)
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -31,8 +31,8 @@ test_setup() {
            [ -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"
+       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
+       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
        dracut_install grep
        inst ./test-init.sh /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth

diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index 500dc50..c6038bd 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -66,8 +66,8 @@ test_setup() {
            [ -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"
+       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
+       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
        dracut_install grep
        inst ./test-init.sh /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth

diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
index d6dbde0..658de8f 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -67,8 +67,8 @@ test_setup() {
            [ -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"
+       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
+       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
        dracut_install grep
        inst ./test-init.sh /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth

diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
index b65e77a..5918b5e 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/test.sh
+++ b/test/TEST-15-BTRFSRAID/test.sh
@@ -33,8 +33,8 @@ test_setup() {
            [ -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"
+       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
+       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
        dracut_install grep
        inst ./test-init.sh /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth

diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
index 3816c18..5cd9986 100755 (executable)
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
@@ -56,8 +56,8 @@ test_setup() {
            [ -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"
+       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
+       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
        dracut_install grep syslinux isohybrid
        for f in /usr/share/syslinux/*; do
            inst_simple "$f"

diff --git a/test/old.TEST-14-IMSM/test.sh b/test/old.TEST-14-IMSM/test.sh
index a60e8d5..5b9438e 100755 (executable)
--- a/test/old.TEST-14-IMSM/test.sh
+++ b/test/old.TEST-14-IMSM/test.sh
@@ -65,8 +65,8 @@ test_setup() {
            [ -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"
+       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
+       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
        dracut_install grep
        inst ./test-init.sh /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth