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 6c39d7bc82f5d43499e73048fe2c2047f8e968ad..3023b6a14768490c74260c86b77f38d90d2e7c79 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 334b636c89de1db8833f772aa8ca2269d6ef548e..9eefce23f89b57dbe67348e986e81ee043b513a5 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 5ebd86956d513939de95b920d8b4bc7d461d1fc1..ef6d0c289a6319313624d0554187e0cf7ac1330f 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 78468bb7360280b5293b5d8e3221c0787bef8e40..034cc4c0d66b5cb065cd5d78ead9d90bddb7e565 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 500dc5078839b213d21d6bec0d2b9441421bb65f..c6038bd2fef827e457693776710856c6da2dcb8c 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 d6dbde0ab8bd3aa9421256afb9d2baf3814e70cd..658de8ffbd27371090c455c458234403353c3b0e 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 b65e77a6b40dd80eb11fafd7168ade50b98f1935..5918b5ee55c7bd184884086cab3d6847efd0c9dd 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 3816c1840359661ad63be1dab8f74cef3cd0024c..5cd9986e48102a5f3702e95ccc56622a8817b6f5 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 a60e8d53d4363cf38d9c200d1c9c66f3408996b5..5b9438efa6b403fbbe2b73594c396abbee7563f6 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