18971c
From 1211a10b959fea039f4c8718c3901ad63e4816d3 Mon Sep 17 00:00:00 2001
18971c
From: Harald Hoyer <harald@redhat.com>
18971c
Date: Thu, 2 Jul 2015 15:40:13 +0200
18971c
Subject: [PATCH] splitup dracut-init.sh from dracut-functions.sh
18971c
18971c
other tools want to source dracut-functions.sh without any mkdir side
18971c
effects.
18971c
18971c
(cherry picked from commit 777f2db0373ccbc1a44fc2d960ecefbe50195055)
18971c
---
18971c
 Makefile                          |  1 +
18971c
 dracut-functions.sh               |  9 ++------
18971c
 dracut-init.sh                    | 34 +++++++++++++++++++++++++++++++
18971c
 dracut.sh                         |  8 ++++----
18971c
 dracut.spec                       |  1 +
18971c
 test/TEST-01-BASIC/test.sh        |  6 +++---
18971c
 test/TEST-02-SYSTEMD/test.sh      |  6 +++---
18971c
 test/TEST-03-USR-MOUNT/test.sh    |  6 +++---
18971c
 test/TEST-04-FULL-SYSTEMD/test.sh |  6 +++---
18971c
 test/TEST-10-RAID/test.sh         |  6 +++---
18971c
 test/TEST-11-LVM/test.sh          |  6 +++---
18971c
 test/TEST-12-RAID-DEG/test.sh     |  6 +++---
18971c
 test/TEST-13-ENC-RAID-LVM/test.sh |  6 +++---
18971c
 test/TEST-14-IMSM/test.sh         |  6 +++---
18971c
 test/TEST-15-BTRFSRAID/test.sh    |  6 +++---
18971c
 test/TEST-16-DMSQUASH/test.sh     |  4 ++--
18971c
 test/TEST-17-LVM-THIN/test.sh     |  6 +++---
18971c
 test/TEST-20-NFS/test.sh          |  6 +++---
18971c
 test/TEST-30-ISCSI/test.sh        |  8 ++++----
18971c
 test/TEST-40-NBD/test.sh          | 10 ++++-----
18971c
 test/TEST-50-MULTINIC/test.sh     |  6 +++---
18971c
 21 files changed, 92 insertions(+), 61 deletions(-)
18971c
 create mode 100644 dracut-init.sh
18971c
18971c
diff --git a/Makefile b/Makefile
18971c
index 5441d8f4..18f5a88c 100644
18971c
--- a/Makefile
18971c
+++ b/Makefile
18971c
@@ -106,6 +106,7 @@ install: dracut-version.sh
18971c
 	install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
18971c
 	mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
18971c
 	mkdir -p $(DESTDIR)$(pkglibdir)/dracut.conf.d
18971c
+	install -m 0755 dracut-init.sh $(DESTDIR)$(pkglibdir)/dracut-init.sh
18971c
 	install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh
18971c
 	install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh
18971c
 	ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions
18971c
diff --git a/dracut-functions.sh b/dracut-functions.sh
18971c
index 4ea3204d..31586ca4 100755
18971c
--- a/dracut-functions.sh
18971c
+++ b/dracut-functions.sh
18971c
@@ -22,14 +22,9 @@
18971c
 export LC_MESSAGES=C
18971c
 
18971c
 if [[ $DRACUT_KERNEL_LAZY ]] && ! [[ $DRACUT_KERNEL_LAZY_HASHDIR ]]; then
18971c
-    if ! [[ -d "$initdir/.kernelmodseen" ]]; then
18971c
-        mkdir -p "$initdir/.kernelmodseen"
18971c
+    if [[ -d "$initdir/.kernelmodseen" ]]; then
18971c
+        DRACUT_KERNEL_LAZY_HASHDIR="$initdir/.kernelmodseen"
18971c
     fi
18971c
-    DRACUT_KERNEL_LAZY_HASHDIR="$initdir/.kernelmodseen"
18971c
-fi
18971c
-
18971c
-if [[ $initdir ]] && ! [[ -d $initdir ]]; then
18971c
-    mkdir -p "$initdir"
18971c
 fi
18971c
 
18971c
 # Generic substring function.  If $2 is in $1, return 0.
18971c
diff --git a/dracut-init.sh b/dracut-init.sh
18971c
new file mode 100644
18971c
index 00000000..469e42ad
18971c
--- /dev/null
18971c
+++ b/dracut-init.sh
18971c
@@ -0,0 +1,34 @@
18971c
+#!/bin/bash
18971c
+#
18971c
+# functions used by dracut and other tools.
18971c
+#
18971c
+# Copyright 2005-2009 Red Hat, Inc.  All rights reserved.
18971c
+#
18971c
+# This program is free software; you can redistribute it and/or modify
18971c
+# it under the terms of the GNU General Public License as published by
18971c
+# the Free Software Foundation; either version 2 of the License, or
18971c
+# (at your option) any later version.
18971c
+#
18971c
+# This program is distributed in the hope that it will be useful,
18971c
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
18971c
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18971c
+# GNU General Public License for more details.
18971c
+#
18971c
+# You should have received a copy of the GNU General Public License
18971c
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18971c
+#
18971c
+export LC_MESSAGES=C
18971c
+
18971c
+if [[ $DRACUT_KERNEL_LAZY ]] && ! [[ $DRACUT_KERNEL_LAZY_HASHDIR ]]; then
18971c
+    if ! [[ -d "$initdir/.kernelmodseen" ]]; then
18971c
+        mkdir -p "$initdir/.kernelmodseen"
18971c
+    fi
18971c
+    DRACUT_KERNEL_LAZY_HASHDIR="$initdir/.kernelmodseen"
18971c
+fi
18971c
+
18971c
+if [[ $initdir ]] && ! [[ -d $initdir ]]; then
18971c
+    mkdir -p "$initdir"
18971c
+fi
18971c
+
18971c
+[[ $dracutbasedir ]] || export dracutbasedir=${BASH_SOURCE%/*}
18971c
+. $dracutbasedir/dracut-functions.sh
18971c
diff --git a/dracut.sh b/dracut.sh
18971c
index cc22a14d..a214f810 100755
18971c
--- a/dracut.sh
18971c
+++ b/dracut.sh
18971c
@@ -519,7 +519,7 @@ while :; do
18971c
         -q|--quiet)    ((verbosity_mod_l--));;
18971c
         -l|--local)
18971c
                        allowlocal="yes"
18971c
-                       [[ -f "$(readlink -f "${0%/*}")/dracut-functions.sh" ]] \
18971c
+                       [[ -f "$(readlink -f "${0%/*}")/dracut-init.sh" ]] \
18971c
                            && dracutbasedir="$(readlink -f "${0%/*}")"
18971c
                        ;;
18971c
         -H|--hostonly|--host-only)
18971c
@@ -841,10 +841,10 @@ if [[ $print_cmdline ]]; then
18971c
     kmsgloglvl=0
18971c
 fi
18971c
 
18971c
-if [[ -f $dracutbasedir/dracut-functions.sh ]]; then
18971c
-    . $dracutbasedir/dracut-functions.sh
18971c
+if [[ -f $dracutbasedir/dracut-init.sh ]]; then
18971c
+    . $dracutbasedir/dracut-init.sh
18971c
 else
18971c
-    printf "%s\n" "dracut: Cannot find $dracutbasedir/dracut-functions.sh." >&2
18971c
+    printf "%s\n" "dracut: Cannot find $dracutbasedir/dracut-init.sh." >&2
18971c
     printf "%s\n" "dracut: Are you running from a git checkout?" >&2
18971c
     printf "%s\n" "dracut: Try passing -l as an argument to $0" >&2
18971c
     exit 1
18971c
diff --git a/dracut.spec b/dracut.spec
18971c
index 302cfc5d..d22f5861 100644
18971c
--- a/dracut.spec
18971c
+++ b/dracut.spec
18971c
@@ -296,6 +296,7 @@ rm -rf -- $RPM_BUILD_ROOT
18971c
 %endif
18971c
 %dir %{dracutlibdir}
18971c
 %dir %{dracutlibdir}/modules.d
18971c
+%{dracutlibdir}/dracut-init.sh
18971c
 %{dracutlibdir}/dracut-functions.sh
18971c
 %{dracutlibdir}/dracut-functions
18971c
 %{dracutlibdir}/dracut-version.sh
18971c
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
18971c
index 02ebc231..642b250e 100755
18971c
--- a/test/TEST-01-BASIC/test.sh
18971c
+++ b/test/TEST-01-BASIC/test.sh
18971c
@@ -29,7 +29,7 @@ test_setup() {
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay/source
18971c
 	mkdir -p $initdir
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
18971c
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient \
18971c
 	    umount strace less setsid
18971c
@@ -51,7 +51,7 @@ test_setup() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sfdisk mkfs.ext3 poweroff cp umount sync
18971c
 	inst_hook initqueue 01 ./create-root.sh
18971c
         inst_hook initqueue/finished 01 ./finished-false.sh
18971c
@@ -80,7 +80,7 @@ test_setup() {
18971c
 
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
18971c
index 2a8ed6b5..4ebff837 100755
18971c
--- a/test/TEST-02-SYSTEMD/test.sh
18971c
+++ b/test/TEST-02-SYSTEMD/test.sh
18971c
@@ -25,7 +25,7 @@ test_setup() {
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay/source
18971c
 	mkdir -p $initdir
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
18971c
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient \
18971c
 	    umount strace less setsid
18971c
@@ -47,7 +47,7 @@ test_setup() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sfdisk mkfs.ext3 poweroff cp umount
18971c
 	inst_hook initqueue 01 ./create-root.sh
18971c
         inst_hook initqueue/finished 01 ./finished-false.sh
18971c
@@ -76,7 +76,7 @@ test_setup() {
18971c
 
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
18971c
index b8231fed..e772352a 100755
18971c
--- a/test/TEST-03-USR-MOUNT/test.sh
18971c
+++ b/test/TEST-03-USR-MOUNT/test.sh
18971c
@@ -55,7 +55,7 @@ test_setup() {
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay/source
18971c
 	mkdir -p $initdir
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
18971c
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient \
18971c
 	    umount strace less setsid
18971c
@@ -78,7 +78,7 @@ test_setup() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sfdisk mkfs.btrfs btrfs poweroff cp umount sync
18971c
 	inst_hook initqueue 01 ./create-root.sh
18971c
         inst_hook initqueue/finished 01 ./finished-false.sh
18971c
@@ -114,7 +114,7 @@ test_setup() {
18971c
 
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
18971c
index aa83122c..38342386 100755
18971c
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
18971c
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
18971c
@@ -57,7 +57,7 @@ test_setup() {
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay/source
18971c
 	mkdir -p $initdir
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 
18971c
         for d in usr/bin usr/sbin bin etc lib "$libdir" sbin tmp usr var var/log dev proc sys sysroot root run; do
18971c
             if [ -L "/$d" ]; then
18971c
@@ -221,7 +221,7 @@ EOF
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sfdisk mkfs.btrfs btrfs poweroff cp umount sync
18971c
 	inst_hook initqueue 01 ./create-root.sh
18971c
         inst_hook initqueue/finished 01 ./finished-false.sh
18971c
@@ -256,7 +256,7 @@ EOF
18971c
 
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
18971c
index d79d5cd4..cf474dff 100755
18971c
--- a/test/TEST-10-RAID/test.sh
18971c
+++ b/test/TEST-10-RAID/test.sh
18971c
@@ -28,7 +28,7 @@ test_setup() {
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay/source
18971c
 	(mkdir -p "$initdir"; cd "$initdir"; mkdir -p dev sys proc etc var/run tmp run)
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
18971c
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
18971c
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
18971c
@@ -49,7 +49,7 @@ test_setup() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sfdisk mke2fs poweroff cp umount
18971c
 	inst_hook initqueue 01 ./create-root.sh
18971c
         inst_hook initqueue/finished 01 ./finished-false.sh
18971c
@@ -77,7 +77,7 @@ test_setup() {
18971c
 
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst ./cryptroot-ask.sh /sbin/cryptroot-ask
18971c
diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
18971c
index 732d0c8f..c3c27bce 100755
18971c
--- a/test/TEST-11-LVM/test.sh
18971c
+++ b/test/TEST-11-LVM/test.sh
18971c
@@ -24,7 +24,7 @@ test_setup() {
18971c
     # Create what will eventually be our root filesystem onto an overlay
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay/source
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
18971c
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
18971c
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
18971c
@@ -46,7 +46,7 @@ test_setup() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sfdisk mke2fs poweroff cp umount
18971c
 	inst_hook initqueue 01 ./create-root.sh
18971c
         inst_hook initqueue/finished 01 ./finished-false.sh
18971c
@@ -69,7 +69,7 @@ test_setup() {
18971c
     grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
18971c
index 87fe542f..11f66b23 100755
18971c
--- a/test/TEST-12-RAID-DEG/test.sh
18971c
+++ b/test/TEST-12-RAID-DEG/test.sh
18971c
@@ -66,7 +66,7 @@ test_setup() {
18971c
     # Create what will eventually be our root filesystem onto an overlay
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay/source
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
18971c
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
18971c
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
18971c
@@ -87,7 +87,7 @@ test_setup() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sfdisk mke2fs poweroff cp umount dd grep
18971c
 	inst_hook initqueue 01 ./create-root.sh
18971c
         inst_hook initqueue/finished 01 ./finished-false.sh
18971c
@@ -120,7 +120,7 @@ test_setup() {
18971c
 
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
18971c
index 129620b1..993f71db 100755
18971c
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
18971c
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
18971c
@@ -62,7 +62,7 @@ test_setup() {
18971c
     # Create what will eventually be our root filesystem onto an overlay
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay/source
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
18971c
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
18971c
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
18971c
@@ -83,7 +83,7 @@ test_setup() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sfdisk mke2fs poweroff cp umount grep
18971c
 	inst_hook initqueue 01 ./create-root.sh
18971c
         inst_hook initqueue/finished 01 ./finished-false.sh
18971c
@@ -113,7 +113,7 @@ test_setup() {
18971c
 
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
18971c
index ad0cf7b0..9465965c 100755
18971c
--- a/test/TEST-14-IMSM/test.sh
18971c
+++ b/test/TEST-14-IMSM/test.sh
18971c
@@ -54,7 +54,7 @@ test_setup() {
18971c
     # Create what will eventually be our root filesystem onto an overlay
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay/source
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
18971c
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
18971c
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
18971c
@@ -76,7 +76,7 @@ test_setup() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sfdisk mke2fs poweroff cp umount grep
18971c
 	inst_hook initqueue 01 ./create-root.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
@@ -104,7 +104,7 @@ test_setup() {
18971c
     echo $MD_UUID > $TESTDIR/mduuid
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
18971c
index 71f5703a..9b971362 100755
18971c
--- a/test/TEST-15-BTRFSRAID/test.sh
18971c
+++ b/test/TEST-15-BTRFSRAID/test.sh
18971c
@@ -26,7 +26,7 @@ test_setup() {
18971c
     # Create what will eventually be our root filesystem onto an overlay
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay/source
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
18971c
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
18971c
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
18971c
@@ -47,7 +47,7 @@ test_setup() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sfdisk mkfs.btrfs poweroff cp umount
18971c
 	inst_hook initqueue 01 ./create-root.sh
18971c
         inst_hook initqueue/finished 01 ./finished-false.sh
18971c
@@ -77,7 +77,7 @@ test_setup() {
18971c
 
18971c
    (
18971c
         export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
18971c
index 252e8454..c08a2a41 100755
18971c
--- a/test/TEST-16-DMSQUASH/test.sh
18971c
+++ b/test/TEST-16-DMSQUASH/test.sh
18971c
@@ -30,7 +30,7 @@ test_setup() {
18971c
     mkdir -p -- "$TESTDIR"/overlay
18971c
     (
18971c
 	export initdir="$TESTDIR"/overlay
18971c
-	. "$basedir"/dracut-functions.sh
18971c
+	. "$basedir"/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
@@ -48,7 +48,7 @@ test_setup() {
18971c
     # Create what will eventually be our root filesystem onto an overlay
18971c
     (
18971c
 	export initdir="$TESTDIR"/root-source
18971c
-	. "$basedir"/dracut-functions.sh
18971c
+	. "$basedir"/dracut-init.sh
18971c
 	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
18971c
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient \
18971c
 	    umount strace less
18971c
diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
18971c
index 4c904b0a..79e224e2 100755
18971c
--- a/test/TEST-17-LVM-THIN/test.sh
18971c
+++ b/test/TEST-17-LVM-THIN/test.sh
18971c
@@ -24,7 +24,7 @@ test_setup() {
18971c
     # Create what will eventually be our root filesystem onto an overlay
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay/source
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
18971c
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
18971c
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
18971c
@@ -46,7 +46,7 @@ test_setup() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple sfdisk mke2fs poweroff cp umount
18971c
 	inst_hook initqueue 01 ./create-root.sh
18971c
         inst_hook initqueue/finished 01 ./finished-false.sh
18971c
@@ -69,7 +69,7 @@ test_setup() {
18971c
     grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
18971c
     (
18971c
 	export initdir=$TESTDIR/overlay
18971c
-	. $basedir/dracut-functions.sh
18971c
+	. $basedir/dracut-init.sh
18971c
 	inst_multiple poweroff shutdown
18971c
 	inst_hook emergency 000 ./hard-off.sh
18971c
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
18971c
index 7b5e3c5d..14350e98 100755
18971c
--- a/test/TEST-20-NFS/test.sh
18971c
+++ b/test/TEST-20-NFS/test.sh
18971c
@@ -221,7 +221,7 @@ test_setup() {
18971c
 
18971c
     (
18971c
         export initdir=$TESTDIR/mnt
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
 
18971c
         for _f in modules.builtin.bin modules.builtin; do
18971c
             [[ $srcmods/$_f ]] && break
18971c
@@ -287,7 +287,7 @@ test_setup() {
18971c
     # Make client root inside server root
18971c
     (
18971c
         export initdir=$TESTDIR/mnt/nfs/client
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
 
18971c
         inst_multiple sh shutdown poweroff stty cat ps ln ip \
18971c
             mount dmesg mkdir cp ping grep
18971c
@@ -331,7 +331,7 @@ test_setup() {
18971c
     # Make an overlay with needed tools for the test harness
18971c
     (
18971c
         export initdir=$TESTDIR/overlay
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
         mkdir $TESTDIR/overlay
18971c
         inst_multiple poweroff shutdown
18971c
         inst_hook emergency 000 ./hard-off.sh
18971c
diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
18971c
index f5977839..a258c042 100755
18971c
--- a/test/TEST-30-ISCSI/test.sh
18971c
+++ b/test/TEST-30-ISCSI/test.sh
18971c
@@ -104,7 +104,7 @@ test_setup() {
18971c
     # Create what will eventually be our root filesystem onto an overlay
18971c
     (
18971c
         export initdir=$TESTDIR/overlay/source
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
         inst_multiple sh shutdown poweroff stty cat ps ln ip \
18971c
             mount dmesg mkdir cp ping grep
18971c
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
18971c
@@ -121,7 +121,7 @@ test_setup() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
         export initdir=$TESTDIR/overlay
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
         inst_multiple sfdisk mkfs.ext3 poweroff cp umount
18971c
         inst_hook initqueue 01 ./create-root.sh
18971c
         inst_hook initqueue/finished 01 ./finished-false.sh
18971c
@@ -157,7 +157,7 @@ test_setup() {
18971c
     rm -- $TESTDIR/client.img
18971c
     (
18971c
         export initdir=$TESTDIR/overlay
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
         inst_multiple poweroff shutdown
18971c
         inst_hook emergency 000 ./hard-off.sh
18971c
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
@@ -177,7 +177,7 @@ test_setup() {
18971c
     kernel=$KVERSION
18971c
     (
18971c
         export initdir=$TESTDIR/mnt
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
         (
18971c
             cd "$initdir";
18971c
             mkdir -p dev sys proc etc var/run tmp var/lib/dhcpd /etc/iscsi
18971c
diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
18971c
index 59494ed8..abf1a4f4 100755
18971c
--- a/test/TEST-40-NBD/test.sh
18971c
+++ b/test/TEST-40-NBD/test.sh
18971c
@@ -195,7 +195,7 @@ make_encrypted_root() {
18971c
     # Create what will eventually be our root filesystem onto an overlay
18971c
     (
18971c
         export initdir=$TESTDIR/overlay/source
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
         mkdir -p "$initdir"
18971c
         (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
18971c
         inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
18971c
@@ -214,7 +214,7 @@ make_encrypted_root() {
18971c
     # second, install the files needed to make the root filesystem
18971c
     (
18971c
         export initdir=$TESTDIR/overlay
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
         inst_multiple mke2fs poweroff cp umount tune2fs
18971c
         inst_hook emergency 000 ./hard-off.sh
18971c
         inst_hook initqueue 01 ./create-root.sh
18971c
@@ -253,7 +253,7 @@ make_client_root() {
18971c
     kernel=$KVERSION
18971c
     (
18971c
         export initdir=$TESTDIR/mnt
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
         mkdir -p "$initdir"
18971c
         (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
18971c
         inst_multiple sh ls shutdown poweroff stty cat ps ln ip \
18971c
@@ -288,7 +288,7 @@ make_server_root() {
18971c
     kernel=$KVERSION
18971c
     (
18971c
         export initdir=$TESTDIR/mnt
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
         mkdir -p "$initdir"
18971c
         (
18971c
             cd "$initdir";
18971c
@@ -335,7 +335,7 @@ test_setup() {
18971c
     # Make the test image
18971c
     (
18971c
         export initdir=$TESTDIR/overlay
18971c
-        . $basedir/dracut-functions.sh
18971c
+        . $basedir/dracut-init.sh
18971c
         inst_multiple poweroff shutdown
18971c
         inst_hook emergency 000 ./hard-off.sh
18971c
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
18971c
diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
18971c
index 3c6003b4..4f73203f 100755
18971c
--- a/test/TEST-50-MULTINIC/test.sh
18971c
+++ b/test/TEST-50-MULTINIC/test.sh
18971c
@@ -150,7 +150,7 @@ test_setup() {
18971c
 
18971c
     (
18971c
         export initdir="$TESTDIR"/mnt
18971c
-        . "$basedir"/dracut-functions.sh
18971c
+        . "$basedir"/dracut-init.sh
18971c
 
18971c
         (
18971c
             cd "$initdir";
18971c
@@ -216,7 +216,7 @@ test_setup() {
18971c
     # Make client root inside server root
18971c
     (
18971c
         export initdir="$TESTDIR"/mnt/nfs/client
18971c
-        . "$basedir"/dracut-functions.sh
18971c
+        . "$basedir"/dracut-init.sh
18971c
         inst_multiple sh shutdown poweroff stty cat ps ln ip \
18971c
             mount dmesg mkdir cp ping grep ls
18971c
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
18971c
@@ -256,7 +256,7 @@ test_setup() {
18971c
     # Make an overlay with needed tools for the test harness
18971c
     (
18971c
         export initdir="$TESTDIR"/overlay
18971c
-        . "$basedir"/dracut-functions.sh
18971c
+        . "$basedir"/dracut-init.sh
18971c
         inst_multiple poweroff shutdown
18971c
         inst_hook emergency 000 ./hard-off.sh
18971c
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules