splitup dracut-init.sh from dracut-functions.sh

other tools want to source dracut-functions.sh without any mkdir side
effects.

diff --git a/Makefile b/Makefile
index 0af5d0f1f43c87f08866c835540925281934f28e..98a2fbf60418ebfe39dd6c076e1dc333c76635bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -118,6 +118,7 @@ install: all
        install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
        mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
        mkdir -p $(DESTDIR)$(pkglibdir)/dracut.conf.d
+       install -m 0755 dracut-init.sh $(DESTDIR)$(pkglibdir)/dracut-init.sh
        install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh
        install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh
        ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions

diff --git a/dracut-functions.sh b/dracut-functions.sh
index 8f971c0b0d635799292ba29051fe8e43e767a6ff..f415f0de22005973d35dec167c922b587980f8d4 100755 (executable)
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -20,14 +20,9 @@
 export LC_MESSAGES=C
 
 if [[ $DRACUT_KERNEL_LAZY ]] && ! [[ $DRACUT_KERNEL_LAZY_HASHDIR ]]; then
-    if ! [[ -d "$initdir/.kernelmodseen" ]]; then
-        mkdir -p "$initdir/.kernelmodseen"
+    if [[ -d "$initdir/.kernelmodseen" ]]; then
+        DRACUT_KERNEL_LAZY_HASHDIR="$initdir/.kernelmodseen"
     fi
-    DRACUT_KERNEL_LAZY_HASHDIR="$initdir/.kernelmodseen"
-fi
-
-if [[ $initdir ]] && ! [[ -d $initdir ]]; then
-    mkdir -p "$initdir"
 fi
 
 # Generic substring function.  If $2 is in $1, return 0.

diff --git a/dracut-init.sh b/dracut-init.sh
new file mode 100644 (file)
index 0000000..469e42a
--- /dev/null
+++ b/dracut-init.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# functions used by dracut and other tools.
+#
+# Copyright 2005-2009 Red Hat, Inc.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+export LC_MESSAGES=C
+
+if [[ $DRACUT_KERNEL_LAZY ]] && ! [[ $DRACUT_KERNEL_LAZY_HASHDIR ]]; then
+    if ! [[ -d "$initdir/.kernelmodseen" ]]; then
+        mkdir -p "$initdir/.kernelmodseen"
+    fi
+    DRACUT_KERNEL_LAZY_HASHDIR="$initdir/.kernelmodseen"
+fi
+
+if [[ $initdir ]] && ! [[ -d $initdir ]]; then
+    mkdir -p "$initdir"
+fi
+
+[[ $dracutbasedir ]] || export dracutbasedir=${BASH_SOURCE%/*}
+. $dracutbasedir/dracut-functions.sh

diff --git a/dracut.sh b/dracut.sh
index 52383c030b38243e34e5d46232d784e9e522d8c9..8394cee43225325f9494e813ebf776a2af71c191 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -551,7 +551,7 @@ while :; do
         -q|--quiet)    ((verbosity_mod_l--));;
         -l|--local)
                        allowlocal="yes"
-                       [[ -f "$(readlink -f "${0%/*}")/dracut-functions.sh" ]] \
+                       [[ -f "$(readlink -f "${0%/*}")/dracut-init.sh" ]] \
                            && dracutbasedir="$(readlink -f "${0%/*}")"
                        ;;
         -H|--hostonly|--host-only)
@@ -917,10 +917,10 @@ if [[ -f $dracutbasedir/dracut-version.sh ]]; then
     . $dracutbasedir/dracut-version.sh
 fi
 
-if [[ -f $dracutbasedir/dracut-functions.sh ]]; then
-    . $dracutbasedir/dracut-functions.sh
+if [[ -f $dracutbasedir/dracut-init.sh ]]; then
+    . $dracutbasedir/dracut-init.sh
 else
-    printf "%s\n" "dracut: Cannot find $dracutbasedir/dracut-functions.sh." >&2
+    printf "%s\n" "dracut: Cannot find $dracutbasedir/dracut-init.sh." >&2
     printf "%s\n" "dracut: Are you running from a git checkout?" >&2
     printf "%s\n" "dracut: Try passing -l as an argument to $0" >&2
     exit 1

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 4897cc9e8e7550b7e370e81ff15c1a35b76d0375..83320e273c7acbca8c71b00fd78cef3f8ef5f998 100755 (executable)
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -29,7 +29,7 @@ test_setup() {
     (
        export initdir=$TESTDIR/overlay/source
        mkdir -p $initdir
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp
@@ -58,7 +58,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple sfdisk mkfs.ext3 poweroff cp umount sync
        inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -87,7 +87,7 @@ test_setup() {
 
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
index 3cc5d0aeb775b3c9f888dbbd61608a33feb0b09c..16f5c2659ea9bff12a86695260b957d7d8a9c6a4 100755 (executable)
--- a/test/TEST-02-SYSTEMD/test.sh
+++ b/test/TEST-02-SYSTEMD/test.sh
@@ -25,7 +25,7 @@ test_setup() {
     (
        export initdir=$TESTDIR/overlay/source
        mkdir -p $initdir
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
         (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp
@@ -55,7 +55,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple sfdisk mkfs.ext3 poweroff cp umount
        inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -84,7 +84,7 @@ test_setup() {
 
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index cccec31bf118fcef8c78fd9e13303fc9e3af797c..61063fd51029c5cacee253987bb4f91f60611e13 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -56,7 +56,7 @@ test_setup() {
     (
        export initdir=$TESTDIR/overlay/source
        mkdir -p $initdir
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp
@@ -86,7 +86,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple sfdisk mkfs.btrfs btrfs poweroff cp umount sync
        inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -122,7 +122,7 @@ test_setup() {
 
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index 6e05f0da7016a16ca1fabbe32b8919376c79b4e1..1c12e4f08d9208502ce5349bcf53c20cbd8d126d 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -57,7 +57,7 @@ test_setup() {
     (
        export initdir=$TESTDIR/overlay/source
        mkdir -p $initdir
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
 
         for d in usr/bin usr/sbin bin etc lib "$libdir" sbin tmp usr var var/log dev proc sys sysroot root run; do
             if [ -L "/$d" ]; then
@@ -222,7 +222,7 @@ EOF
     # second, install the files needed to make the root filesystem
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple sfdisk mkfs.btrfs btrfs poweroff cp umount sync
        inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -254,7 +254,7 @@ EOF
 
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index e7a1131be6c0f908f37df1e522096aede1e2d464..523b61a6e7c90ba8c59deb65a1beb51181854d3f 100755 (executable)
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -27,7 +27,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
        export initdir=$TESTDIR/overlay/source
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp
@@ -56,7 +56,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple sfdisk mke2fs poweroff cp umount
        inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -84,7 +84,7 @@ test_setup() {
 
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst ./cryptroot-ask.sh /sbin/cryptroot-ask

diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index 0002455aa5be6f9f7c92d85c402debd029cc37ad..34c7736a1ce79a4fc79ef5e30597a9a6a02ff016 100755 (executable)
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -24,7 +24,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
        export initdir=$TESTDIR/overlay/source
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
         (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp
@@ -54,7 +54,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple sfdisk mke2fs poweroff cp umount
        inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -77,7 +77,7 @@ test_setup() {
     grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index 6c7b8b3279ea8dcc1defef46937adaff3289d3f3..f4ec2d0050ede2b3729e802e3b03efc1d7ebd193 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -66,7 +66,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
        export initdir=$TESTDIR/overlay/source
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp
@@ -94,7 +94,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple sfdisk mke2fs poweroff cp umount dd grep
        inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -127,7 +127,7 @@ test_setup() {
 
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
index 14d8196684b116b982735306b3594ff54bcfdab7..ea816976ba4d1018578c348180eb404a035ab64c 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -62,7 +62,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
        export initdir=$TESTDIR/overlay/source
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
         (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp
@@ -91,7 +91,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple sfdisk mke2fs poweroff cp umount grep
        inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -121,7 +121,7 @@ test_setup() {
 
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
index 291f3c5cec8ed10f7b6adc508902aaafac389dc4..a05d091f7e57f9c44bfbcd8fc25df29b20ec1992 100755 (executable)
--- a/test/TEST-14-IMSM/test.sh
+++ b/test/TEST-14-IMSM/test.sh
@@ -54,7 +54,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
        export initdir=$TESTDIR/overlay/source
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp
@@ -83,7 +83,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple sfdisk mke2fs poweroff cp umount grep
        inst_hook initqueue 01 ./create-root.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -111,7 +111,7 @@ test_setup() {
     echo $MD_UUID > $TESTDIR/mduuid
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
index 7f99d8bd03d4f9d8cd40796512f4ac61e4fd4862..5a9b6e1f633684f65c35d58fcb03fbe4e5ddf91d 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/test.sh
+++ b/test/TEST-15-BTRFSRAID/test.sh
@@ -26,7 +26,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
        export initdir=$TESTDIR/overlay/source
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
         (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp
@@ -55,7 +55,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple sfdisk mkfs.btrfs poweroff cp umount
        inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -85,7 +85,7 @@ test_setup() {
 
    (
         export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
index 338f7f4ea029ea98c39b3df0b66aeee2b3ec4a70..7e5a7de2d74bd63ed43217c19f3412dabdc8f6c2 100755 (executable)
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
@@ -30,7 +30,7 @@ test_setup() {
     mkdir -p -- "$TESTDIR"/overlay
     (
        export initdir="$TESTDIR"/overlay
-       . "$basedir"/dracut-functions.sh
+       . "$basedir"/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -49,7 +49,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
        export initdir="$TESTDIR"/root-source
-       . "$basedir"/dracut-functions.sh
+       . "$basedir"/dracut-init.sh
        (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp

diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
index 811a66cc46231266fd4e3c9efbb579b7c824250a..859d4dc05d16b733413b683724a731aa6a15b4d9 100755 (executable)
--- a/test/TEST-17-LVM-THIN/test.sh
+++ b/test/TEST-17-LVM-THIN/test.sh
@@ -24,7 +24,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
        export initdir=$TESTDIR/overlay/source
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
         (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp
@@ -54,7 +54,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple sfdisk mke2fs poweroff cp umount
        inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -77,7 +77,7 @@ test_setup() {
     grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
     (
        export initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions.sh
+       . $basedir/dracut-init.sh
        inst_multiple poweroff shutdown
        inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 04616ef7787c5746469cd25f87d7a260337ca797..61e4c1ac9c6a748d7669f91d6e4f2bddcf03942b 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -217,7 +217,7 @@ test_setup() {
 
     (
         export initdir=$TESTDIR/mnt
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
 
         for _f in modules.builtin.bin modules.builtin; do
             [[ $srcmods/$_f ]] && break
@@ -283,7 +283,7 @@ test_setup() {
     # Make client root inside server root
     (
         export initdir=$TESTDIR/mnt/nfs/client
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
 
         inst_multiple sh shutdown poweroff stty cat ps ln ip \
             mount dmesg mkdir cp ping grep setsid ls vi /etc/virc less cat
@@ -331,7 +331,7 @@ test_setup() {
     # Make an overlay with needed tools for the test harness
     (
         export initdir=$TESTDIR/overlay
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
         mkdir $TESTDIR/overlay
         inst_multiple poweroff shutdown
         inst_hook emergency 000 ./hard-off.sh

diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index 2c082fed994d9ce5bc80bbdc4482e1d60e4e1d3f..59e9c5bd887064861926aee548fe971c4621027a 100755 (executable)
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -103,7 +103,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
         export initdir=$TESTDIR/overlay/source
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
         (
             cd "$initdir"
             mkdir -p -- dev sys proc etc var/run tmp
@@ -128,7 +128,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
         export initdir=$TESTDIR/overlay
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
         inst_multiple sfdisk mkfs.ext3 poweroff cp umount setsid
         inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
@@ -164,7 +164,7 @@ test_setup() {
     rm -- $TESTDIR/client.img
     (
         export initdir=$TESTDIR/overlay
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
         inst_multiple poweroff shutdown
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -185,7 +185,7 @@ test_setup() {
     kernel=$KVERSION
     (
         export initdir=$TESTDIR/mnt
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
         (
             cd "$initdir";
             mkdir -p dev sys proc etc var/run tmp var/lib/dhcpd /etc/iscsi

diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index aa4b46bcaa9de17c4a5fe03f176fb0fcbe897872..39966ace6f902fede27868b0edbb9db6e20aa3b7 100755 (executable)
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -192,7 +192,7 @@ make_encrypted_root() {
     # Create what will eventually be our root filesystem onto an overlay
     (
         export initdir=$TESTDIR/overlay/source
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
         mkdir -p "$initdir"
         (
             cd "$initdir"; mkdir -p dev sys proc etc var/run tmp
@@ -217,7 +217,7 @@ make_encrypted_root() {
     # second, install the files needed to make the root filesystem
     (
         export initdir=$TESTDIR/overlay
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
         (
             cd "$initdir"; mkdir -p dev sys proc etc var/run tmp
             mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin
@@ -263,7 +263,7 @@ make_client_root() {
     kernel=$KVERSION
     (
         export initdir=$TESTDIR/mnt
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
         mkdir -p "$initdir"
         (
             cd "$initdir"; mkdir -p dev sys proc etc var/run tmp
@@ -304,7 +304,7 @@ make_server_root() {
     kernel=$KVERSION
     (
         export initdir=$TESTDIR/mnt
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
         mkdir -p "$initdir"
         (
             cd "$initdir";
@@ -351,7 +351,7 @@ test_setup() {
     # Make the test image
     (
         export initdir=$TESTDIR/overlay
-        . $basedir/dracut-functions.sh
+        . $basedir/dracut-init.sh
         inst_multiple poweroff shutdown
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index b292cc068ace22fd7e656a75893c077878ca599e..b8783802ef05b40fa93d7af9f49210a8fff51e82 100755 (executable)
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -146,7 +146,7 @@ test_setup() {
 
     (
         export initdir="$TESTDIR"/mnt
-        . "$basedir"/dracut-functions.sh
+        . "$basedir"/dracut-init.sh
 
         (
             cd "$initdir";
@@ -212,7 +212,7 @@ test_setup() {
     # Make client root inside server root
     (
         export initdir="$TESTDIR"/mnt/nfs/client
-        . "$basedir"/dracut-functions.sh
+        . "$basedir"/dracut-init.sh
         (
             cd "$initdir"
             mkdir -p dev sys proc etc run
@@ -256,7 +256,7 @@ test_setup() {
     # Make an overlay with needed tools for the test harness
     (
         export initdir="$TESTDIR"/overlay
-        . "$basedir"/dracut-functions.sh
+        . "$basedir"/dracut-init.sh
         inst_multiple poweroff shutdown
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules