X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=test%2FTEST-40-NBD%2Ftest.sh;h=7cf64b1555d9df5761a6b0403c61873de388f432;hb=af11946054193dbb13eec70cb62e6b0963c5fb41;hp=124682acef90bb2bd806bf53cf7443f08a921fc5;hpb=32bd2fbb4c8f1d3e1951d75f32c080d4b42c49a4;p=thirdparty%2Fdracut.git

diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index 124682ace..7cf64b155 100755
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -198,15 +198,15 @@ make_encrypted_root() {
         . $basedir/dracut-functions.sh
         mkdir -p "$initdir"
         (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
-        dracut_install sh df free ls shutdown poweroff stty cat ps ln ip \
+        inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
             mount dmesg mkdir cp ping
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             [ -f ${_terminfodir}/l/linux ] && break
         done
-        dracut_install -o ${_terminfodir}/l/linux
+        inst_multiple -o ${_terminfodir}/l/linux
         inst ./client-init.sh /sbin/init
         inst_simple /etc/os-release
-        find_binary plymouth >/dev/null && dracut_install plymouth
+        find_binary plymouth >/dev/null && inst_multiple plymouth
         cp -a /etc/ld.so.conf* $initdir/etc
         sudo ldconfig -r "$initdir"
     )
@@ -215,7 +215,7 @@ make_encrypted_root() {
     (
         export initdir=$TESTDIR/overlay
         . $basedir/dracut-functions.sh
-        dracut_install mke2fs poweroff cp umount tune2fs
+        inst_multiple mke2fs poweroff cp umount tune2fs
         inst_hook emergency 000 ./hard-off.sh
         inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -256,12 +256,12 @@ make_client_root() {
         . $basedir/dracut-functions.sh
         mkdir -p "$initdir"
         (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
-        dracut_install sh ls shutdown poweroff stty cat ps ln ip \
+        inst_multiple sh ls shutdown poweroff stty cat ps ln ip \
             dmesg mkdir cp ping
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             [ -f ${_terminfodir}/l/linux ] && break
         done
-        dracut_install -o ${_terminfodir}/l/linux
+        inst_multiple -o ${_terminfodir}/l/linux
         inst ./client-init.sh /sbin/init
         inst_simple /etc/os-release
         inst /etc/nsswitch.conf /etc/nsswitch.conf
@@ -294,15 +294,15 @@ make_server_root() {
             cd "$initdir";
             mkdir -p dev sys proc etc var/run var/lib/dhcpd tmp
         )
-        dracut_install sh ls shutdown poweroff stty cat ps ln ip \
+        inst_multiple sh ls shutdown poweroff stty cat ps ln ip \
             dmesg mkdir cp ping grep \
             sleep nbd-server chmod
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             [ -f ${_terminfodir}/l/linux ] && break
         done
-        dracut_install -o ${_terminfodir}/l/linux
+        inst_multiple -o ${_terminfodir}/l/linux
         instmods af_packet
-        type -P dhcpd >/dev/null && dracut_install dhcpd
+        type -P dhcpd >/dev/null && inst_multiple dhcpd
         [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
         inst ./server-init.sh /sbin/init
         inst_simple /etc/os-release
@@ -336,7 +336,7 @@ test_setup() {
     (
         export initdir=$TESTDIR/overlay
         . $basedir/dracut-functions.sh
-        dracut_install poweroff shutdown
+        inst_multiple poweroff shutdown
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
         inst ./cryptroot-ask.sh /sbin/cryptroot-ask