Renamed all shell scripts to *.sh

72 files changed, 125 insertions, 124 deletions

diff --git a/Makefile b/Makefile
index 6556c018..a8f9d1bc 100644
--- a/Makefile
+++ b/Makefile
@@ -31,15 +31,15 @@ install: doc
 	mkdir -p $(DESTDIR)$(sysconfdir)
 	mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
 	mkdir -p $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
-	install -m 0755 dracut $(DESTDIR)$(bindir)/dracut
-	install -m 0755 dracut-gencmdline $(DESTDIR)$(bindir)/dracut-gencmdline
-	install -m 0755 dracut-catimages $(DESTDIR)$(bindir)/dracut-catimages
+	install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
+	install -m 0755 dracut-gencmdline.sh $(DESTDIR)$(bindir)/dracut-gencmdline
+	install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
 	install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
-	install -m 0755 lsinitrd $(DESTDIR)$(bindir)/lsinitrd
+	install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd
 	install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
 	mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
-	install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions
-	install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger
+	install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh
+	install -m 0755 dracut-logger.sh $(DESTDIR)$(pkglibdir)/dracut-logger.sh
 	install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore
 	cp -arx modules.d $(DESTDIR)$(pkglibdir)
 	install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8/dracut.8
@@ -86,13 +86,13 @@ rpm: dracut-$(VERSION).tar.bz2
 	( mv "$$rpmbuild"/noarch/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr "$$rpmbuild"; ls *.rpm )
 
 syncheck:
-	@ret=0;for i in dracut-initramfs-restore.sh dracut-logger \
-                        modules.d/99base/init modules.d/*/*.sh; do \
+	@ret=0;for i in dracut-initramfs-restore.sh dracut-logger.sh \
+                        modules.d/99base/init.sh modules.d/*/*.sh; do \
                 [ "$${i##*/}" = "module-setup.sh" ] && continue; \
                 [ "$${i##*/}" = "caps.sh" ] && continue; \
 		dash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret
-	@ret=0;for i in mkinitrd-dracut.sh dracut modules.d/02caps/caps.sh \
+	@ret=0;for i in *.sh mkinitrd-dracut.sh modules.d/02caps/caps.sh \
 	                modules.d/*/module-setup.sh; do \
 		bash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret
@@ -101,17 +101,17 @@ check: all syncheck
 	$(MAKE) -C test check
 
 testimage: all
-	./dracut -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
+	./dracut.sh -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img 
 
 testimages: all
-	./dracut -l -a debug --kernel-only -f test-kernel-$(shell uname -r).img $(shell uname -r)
+	./dracut.sh -l -a debug --kernel-only -f test-kernel-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img 
-	./dracut -l -a debug --no-kernel -f test-dracut.img $(shell uname -r)
+	./dracut.sh -l -a debug --no-kernel -f test-dracut.img $(shell uname -r)
 	@echo wrote  test-dracut.img 
 
 hostimage: all
-	./dracut -H -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
+	./dracut.sh -H -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
 	@echo wrote  test-$(shell uname -r).img 
 
 AUTHORS:
diff --git a/dracut-catimages b/dracut-catimages.sh
index 7ede1f73..7ede1f73 100755
--- a/dracut-catimages
+++ b/dracut-catimages.sh
diff --git a/dracut-functions b/dracut-functions.sh
index e0a08ab2..17ffd680 100755
--- a/dracut-functions
+++ b/dracut-functions.sh
@@ -28,7 +28,7 @@ if ! [[ $dracutbasedir ]]; then
 fi
 
 if ! type dinfo >/dev/null 2>&1; then
-    . "$dracutbasedir/dracut-logger"
+    . "$dracutbasedir/dracut-logger.sh"
     dlog_init
 fi
 
diff --git a/dracut-gencmdline b/dracut-gencmdline.sh
index c909e27b..c909e27b 100755
--- a/dracut-gencmdline
+++ b/dracut-gencmdline.sh
diff --git a/dracut-logger b/dracut-logger.sh
index f1b3a7e2..f1b3a7e2 100755
--- a/dracut-logger
+++ b/dracut-logger.sh
diff --git a/dracut b/dracut.sh
index 526594c4..bcaff62b 100755
--- a/dracut
+++ b/dracut.sh
@@ -307,7 +307,7 @@ unset GREP_OPTIONS
 
 [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
 
-[[ $allowlocal && -f "$(readlink -f ${0%/*})/dracut-functions" ]] && \
+[[ $allowlocal && -f "$(readlink -f ${0%/*})/dracut-functions.sh" ]] && \
     dracutbasedir="$(readlink -f ${0%/*})"
 
 # if we were not passed a config file, try the default one
@@ -436,10 +436,10 @@ fi
 [[ $hostonly = yes ]] && hostonly="-h"
 [[ $hostonly != "-h" ]] && unset hostonly
 
-if [[ -f $dracutbasedir/dracut-functions ]]; then
-    . $dracutbasedir/dracut-functions
+if [[ -f $dracutbasedir/dracut-functions.sh ]]; then
+    . $dracutbasedir/dracut-functions.sh
 else
-    echo "Cannot find $dracutbasedir/dracut-functions." >&2
+    echo "Cannot find $dracutbasedir/dracut-functions.sh." >&2
     echo "Are you running from a git checkout?" >&2
     echo "Try passing -l as an argument to $0" >&2
     exit 1
@@ -452,7 +452,7 @@ if (( ${BASH_VERSINFO[0]} < 3 ||
     exit 1
 fi
 
-dracutfunctions=$dracutbasedir/dracut-functions
+dracutfunctions=$dracutbasedir/dracut-functions.sh
 export dracutfunctions
 
 if (( ${#drivers_l[@]} )); then
diff --git a/dracut.spec b/dracut.spec
index 3a261737..48c0dbb2 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -221,8 +221,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/modules.d
-%{dracutlibdir}/dracut-functions
-%{dracutlibdir}/dracut-logger
+%{dracutlibdir}/dracut-functions.sh
+%{dracutlibdir}/dracut-logger.sh
 %{dracutlibdir}/dracut-initramfs-restore
 %config(noreplace) /etc/dracut.conf
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} > 6
diff --git a/lsinitrd b/lsinitrd.sh
index 11e5c7a3..11e5c7a3 100755
--- a/lsinitrd
+++ b/lsinitrd.sh
diff --git a/modules.d/10i18n/console_init b/modules.d/10i18n/console_init.sh
index b46046bd..b46046bd 100755
--- a/modules.d/10i18n/console_init
+++ b/modules.d/10i18n/console_init.sh
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
index 37c7c095..a5a33885 100755
--- a/modules.d/10i18n/module-setup.sh
+++ b/modules.d/10i18n/module-setup.sh
@@ -84,7 +84,7 @@ install() {
     install_base() {
         dracut_install setfont loadkeys kbd_mode stty
 
-        inst ${moddir}/console_init /lib/udev/console_init
+        inst ${moddir}/console_init.sh /lib/udev/console_init
         inst_rules ${moddir}/10-console.rules
         inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
     }
diff --git a/modules.d/40network/dhclient-script b/modules.d/40network/dhclient-script.sh
index 52e4900c..52e4900c 100755
--- a/modules.d/40network/dhclient-script
+++ b/modules.d/40network/dhclient-script.sh
diff --git a/modules.d/40network/ifup b/modules.d/40network/ifup.sh
index b138e8e3..b138e8e3 100755
--- a/modules.d/40network/ifup
+++ b/modules.d/40network/ifup.sh
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index 2f4d93d9..c91f1648 100755
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -73,9 +73,9 @@ install() {
     local _arch _i _dir
     dracut_install ip arping tr dhclient
     dracut_install -o brctl ifenslave
-    inst "$moddir/ifup" "/sbin/ifup"
-    inst "$moddir/netroot" "/sbin/netroot"
-    inst "$moddir/dhclient-script" "/sbin/dhclient-script"
+    inst "$moddir/ifup.sh" "/sbin/ifup"
+    inst "$moddir/netroot.sh" "/sbin/netroot"
+    inst "$moddir/dhclient-script.sh" "/sbin/dhclient-script"
     inst "$moddir/net-lib.sh" "/lib/net-lib.sh"
     inst_simple "$moddir/dhclient.conf" "/etc/dhclient.conf"
     inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
diff --git a/modules.d/40network/netroot b/modules.d/40network/netroot.sh
index f44a97ba..f44a97ba 100755
--- a/modules.d/40network/netroot
+++ b/modules.d/40network/netroot.sh
diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
index b78c718b..8a675ec5 100755
--- a/modules.d/50plymouth/module-setup.sh
+++ b/modules.d/50plymouth/module-setup.sh
@@ -38,7 +38,7 @@ install() {
     if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
         || ! grep -q PLYMOUTH_POPULATE_SOURCE_FUNCTIONS /usr/libexec/plymouth/plymouth-populate-initrd \
         || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
-        . "$moddir"/plymouth-populate-initrd
+        . "$moddir"/plymouth-populate-initrd.sh
     else
         PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
             /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir
diff --git a/modules.d/50plymouth/plymouth-populate-initrd b/modules.d/50plymouth/plymouth-populate-initrd.sh
index 25657aeb..25657aeb 100755
--- a/modules.d/50plymouth/plymouth-populate-initrd
+++ b/modules.d/50plymouth/plymouth-populate-initrd.sh
diff --git a/modules.d/90dmsquash-live/dmsquash-live-root b/modules.d/90dmsquash-live/dmsquash-live-root.sh
index e3606cf7..e3606cf7 100755
--- a/modules.d/90dmsquash-live/dmsquash-live-root
+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
diff --git a/modules.d/90dmsquash-live/module-setup.sh b/modules.d/90dmsquash-live/module-setup.sh
index 2a7988af..1c792f4b 100755
--- a/modules.d/90dmsquash-live/module-setup.sh
+++ b/modules.d/90dmsquash-live/module-setup.sh
@@ -35,7 +35,7 @@ install() {
     inst_hook pre-udev 30 "$moddir/dmsquash-live-genrules.sh"
     inst_hook pre-udev 30 "$moddir/dmsquash-liveiso-genrules.sh"
     inst_hook pre-pivot 20 "$moddir/apply-live-updates.sh"
-    inst "$moddir/dmsquash-live-root" "/sbin/dmsquash-live-root"
+    inst "$moddir/dmsquash-live-root.sh" "/sbin/dmsquash-live-root"
     # should probably just be generally included
     inst_rules 60-cdrom_id.rules
 }
diff --git a/modules.d/90livenet/livenetroot b/modules.d/90livenet/livenetroot.sh
index bc627604..bc627604 100755
--- a/modules.d/90livenet/livenetroot
+++ b/modules.d/90livenet/livenetroot.sh
diff --git a/modules.d/90livenet/module-setup.sh b/modules.d/90livenet/module-setup.sh
index 31164fd4..c650ef31 100755
--- a/modules.d/90livenet/module-setup.sh
+++ b/modules.d/90livenet/module-setup.sh
@@ -12,6 +12,6 @@ depends() {
 
 install() {
     inst_hook cmdline 29 "$moddir/parse-livenet.sh"
-    inst "$moddir/livenetroot" "/sbin/livenetroot"
+    inst "$moddir/livenetroot.sh" "/sbin/livenetroot"
 }
 
diff --git a/modules.d/95fcoe/fcoe-up b/modules.d/95fcoe/fcoe-up.sh
index 1e1bcf5c..1e1bcf5c 100755
--- a/modules.d/95fcoe/fcoe-up
+++ b/modules.d/95fcoe/fcoe-up.sh
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
index e66798b7..272c83e4 100755
--- a/modules.d/95fcoe/module-setup.sh
+++ b/modules.d/95fcoe/module-setup.sh
@@ -29,7 +29,7 @@ install() {
 
     mkdir -m 0755 -p "$initdir/var/lib/lldpad"
 
-    inst "$moddir/fcoe-up" "/sbin/fcoe-up"
+    inst "$moddir/fcoe-up.sh" "/sbin/fcoe-up"
     inst "$moddir/fcoe-edd.sh" "/sbin/fcoe-edd"
     inst "$moddir/fcoe-genrules.sh" "/sbin/fcoe-genrules.sh"
     inst_hook cmdline 99 "$moddir/parse-fcoe.sh"
diff --git a/modules.d/95iscsi/iscsiroot b/modules.d/95iscsi/iscsiroot.sh
index 7b8f63e7..7b8f63e7 100755
--- a/modules.d/95iscsi/iscsiroot
+++ b/modules.d/95iscsi/iscsiroot.sh
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index 078682c2..b6c1c1f5 100755
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -64,6 +64,6 @@ install() {
     inst iscsi-iname
     inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
     inst_hook pre-pivot 90 "$moddir/cleanup-iscsi.sh"
-    inst "$moddir/iscsiroot" "/sbin/iscsiroot"
+    inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"
     inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
 }
diff --git a/modules.d/95nbd/module-setup.sh b/modules.d/95nbd/module-setup.sh
index a6f812fa..c0f71ccf 100755
--- a/modules.d/95nbd/module-setup.sh
+++ b/modules.d/95nbd/module-setup.sh
@@ -34,6 +34,6 @@ install() {
     inst nbd-client
     inst_hook cmdline 90 "$moddir/parse-nbdroot.sh"
 
-    inst "$moddir/nbdroot" "/sbin/nbdroot"
+    inst "$moddir/nbdroot.sh" "/sbin/nbdroot"
 }
 
diff --git a/modules.d/95nbd/nbdroot b/modules.d/95nbd/nbdroot.sh
index e20b4e45..e20b4e45 100755
--- a/modules.d/95nbd/nbdroot
+++ b/modules.d/95nbd/nbdroot.sh
diff --git a/modules.d/95nbd/parse-nbdroot.sh b/modules.d/95nbd/parse-nbdroot.sh
index e2376689..ec9e1f66 100755
--- a/modules.d/95nbd/parse-nbdroot.sh
+++ b/modules.d/95nbd/parse-nbdroot.sh
@@ -24,15 +24,16 @@ netroot_to_var() {
     server=$2; port=$3;
 }
 
-# Don't continue if root is ok
-[ -n "$rootok" ] && return
-
 # This script is sourced, so root should be set. But let's be paranoid
 [ -z "$root" ] && root=$(getarg root=)
 [ -z "$netroot" ] && netroot=$(getarg netroot=)
 
 # Root takes precedence over netroot
 if [ "${root%%:*}" = "nbd" ] ; then
+
+    # Don't continue if root is ok
+    [ -n "$rootok" ] && return
+
     if [ -n "$netroot" ] ; then
         warn "root takes precedence over netroot. Ignoring netroot"
 
diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
index 19d618c3..ca91951d 100755
--- a/modules.d/95nfs/module-setup.sh
+++ b/modules.d/95nfs/module-setup.sh
@@ -59,7 +59,7 @@ install() {
     inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
     inst_hook pre-udev 99 "$moddir/nfs-start-rpc.sh"
     inst_hook pre-pivot 99 "$moddir/nfsroot-cleanup.sh"
-    inst "$moddir/nfsroot" "/sbin/nfsroot"
+    inst "$moddir/nfsroot.sh" "/sbin/nfsroot"
     inst "$moddir/nfs-lib.sh" "/lib/nfs-lib.sh"
     mkdir -m 0755 -p "$initdir/var/lib/nfs/rpc_pipefs"
     mkdir -m 0755 -p "$initdir/var/lib/rpcbind"
diff --git a/modules.d/95nfs/nfsroot b/modules.d/95nfs/nfsroot.sh
index 589d4ed7..589d4ed7 100755
--- a/modules.d/95nfs/nfsroot
+++ b/modules.d/95nfs/nfsroot.sh
diff --git a/modules.d/99base/init b/modules.d/99base/init.sh
index 4d0a2a25..4d0a2a25 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init.sh
diff --git a/modules.d/99base/initqueue b/modules.d/99base/initqueue.sh
index 2c06a0b2..2c06a0b2 100755
--- a/modules.d/99base/initqueue
+++ b/modules.d/99base/initqueue.sh
diff --git a/modules.d/99base/loginit b/modules.d/99base/loginit.sh
index ff0c3faf..ff0c3faf 100755
--- a/modules.d/99base/loginit
+++ b/modules.d/99base/loginit.sh
diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
index 738af6b5..fd92644e 100755
--- a/modules.d/99base/module-setup.sh
+++ b/modules.d/99base/module-setup.sh
@@ -26,9 +26,9 @@ install() {
     egrep '^root:' "$initdir/etc/passwd" 2>/dev/null || echo  'root:x:0:0::/root:/bin/sh' >> "$initdir/etc/passwd"
     egrep '^nobody:' /etc/passwd >> "$initdir/etc/passwd"
     # install our scripts and hooks
-    inst "$moddir/init" "/init"
-    inst "$moddir/initqueue" "/sbin/initqueue"
-    inst "$moddir/loginit" "/sbin/loginit"
+    inst "$moddir/init.sh" "/init"
+    inst "$moddir/initqueue.sh" "/sbin/initqueue"
+    inst "$moddir/loginit.sh" "/sbin/loginit"
 
     [ -e "${initdir}/lib" ] || mkdir -m 0755 -p ${initdir}/lib
     mkdir -m 0755 -p ${initdir}/lib/dracut
diff --git a/modules.d/99shutdown/module-setup.sh b/modules.d/99shutdown/module-setup.sh
index ae402eff..659e2cf9 100755
--- a/modules.d/99shutdown/module-setup.sh
+++ b/modules.d/99shutdown/module-setup.sh
@@ -16,7 +16,7 @@ install() {
     dracut_install umount
     dracut_install poweroff reboot halt
     dracut_install -o kexec
-    inst "$moddir/shutdown" "$prefix/shutdown"
+    inst "$moddir/shutdown.sh" "$prefix/shutdown"
     [ -e "${initdir}/lib" ] || mkdir -m 0755 -p ${initdir}/lib
     mkdir -m 0755 -p ${initdir}/lib/dracut
     mkdir -m 0755 -p ${initdir}/lib/dracut/hooks
diff --git a/modules.d/99shutdown/shutdown b/modules.d/99shutdown/shutdown.sh
index 2576687f..2576687f 100755
--- a/modules.d/99shutdown/shutdown
+++ b/modules.d/99shutdown/shutdown.sh
diff --git a/test/TEST-01-BASIC/cryptroot-ask b/test/TEST-01-BASIC/cryptroot-ask.sh
index db27c5b8..db27c5b8 100755
--- a/test/TEST-01-BASIC/cryptroot-ask
+++ b/test/TEST-01-BASIC/cryptroot-ask.sh
diff --git a/test/TEST-01-BASIC/test-init b/test/TEST-01-BASIC/test-init.sh
index fd03aa5c..fd03aa5c 100755
--- a/test/TEST-01-BASIC/test-init
+++ b/test/TEST-01-BASIC/test-init.sh
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 72dbec8f..ca7a1fe1 100755
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -26,7 +26,7 @@ test_setup() {
     (
 	initdir=$TESTDIR/overlay/source
 	mkdir -p $initdir
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient \
 	    umount strace less
@@ -37,7 +37,7 @@ test_setup() {
 	inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script"
 	inst "$basedir/modules.d/40network/ifup" "/sbin/ifup"
 	dracut_install grep
-	inst ./test-init /sbin/init
+	inst ./test-init.sh /sbin/init
 	find_binary plymouth >/dev/null && dracut_install plymouth
 	(cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
 	cp -a /etc/ld.so.conf* $initdir/etc
@@ -47,7 +47,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sfdisk mkfs.ext3 poweroff cp umount
 	inst_hook initqueue 01 ./create-root.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -56,7 +56,7 @@ test_setup() {
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-m "dash udev-rules base rootfs-block kernel-modules" \
 	-d "piix ide-gd_mod ata_piix ext3 sd_mod" \
         --nomdadmconf \
@@ -75,12 +75,12 @@ test_setup() {
 
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install poweroff shutdown
 	inst_hook emergency 000 ./hard-off.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
-    sudo $basedir/dracut -l -i $TESTDIR/overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-a "debug" \
 	-d "piix ide-gd_mod ata_piix ext3 sd_mod" \
 	-f $TESTDIR/initramfs.testing $KVERSION || return 1
diff --git a/test/TEST-10-RAID/cryptroot-ask b/test/TEST-10-RAID/cryptroot-ask.sh
index db27c5b8..db27c5b8 100755
--- a/test/TEST-10-RAID/cryptroot-ask
+++ b/test/TEST-10-RAID/cryptroot-ask.sh
diff --git a/test/TEST-10-RAID/test-init b/test/TEST-10-RAID/test-init.sh
index 62afcee0..62afcee0 100755
--- a/test/TEST-10-RAID/test-init
+++ b/test/TEST-10-RAID/test-init.sh
diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index 0209edd3..5ebd8695 100755
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -27,14 +27,14 @@ test_setup() {
     (
 	initdir=$TESTDIR/overlay/source
 	(mkdir -p "$initdir"; cd "$initdir"; mkdir -p dev sys proc etc var/run tmp run)
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
 	    [ -f ${_terminfodir}/l/linux ] && break
 	done
 	dracut_install -o ${_terminfodir}/l/linux
-	inst ./test-init /sbin/init
+	inst ./test-init.sh /sbin/init
 	inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script"
 	inst "$basedir/modules.d/40network/ifup" "/sbin/ifup"
 	dracut_install grep
@@ -47,7 +47,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sfdisk mke2fs poweroff cp umount
 	inst_hook initqueue 01 ./create-root.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -56,7 +56,7 @@ test_setup() {
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod" \
         --nomdadmconf \
@@ -73,13 +73,13 @@ test_setup() {
 
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install poweroff shutdown
 	inst_hook emergency 000 ./hard-off.sh
-	inst ./cryptroot-ask /sbin/cryptroot-ask
+	inst ./cryptroot-ask.sh /sbin/cryptroot-ask
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
-    sudo $basedir/dracut -l -i $TESTDIR/overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-o "plymouth network" \
 	-a "debug" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod" \
diff --git a/test/TEST-11-LVM/cryptroot-ask b/test/TEST-11-LVM/cryptroot-ask.sh
index db27c5b8..db27c5b8 100755
--- a/test/TEST-11-LVM/cryptroot-ask
+++ b/test/TEST-11-LVM/cryptroot-ask.sh
diff --git a/test/TEST-11-LVM/test-init b/test/TEST-11-LVM/test-init.sh
index fd03aa5c..fd03aa5c 100755
--- a/test/TEST-11-LVM/test-init
+++ b/test/TEST-11-LVM/test-init.sh
diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index 3c9cd5c7..78468bb7 100755
--- 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
     (
 	initdir=$TESTDIR/overlay/source
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
@@ -34,7 +34,7 @@ test_setup() {
 	inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script"
 	inst "$basedir/modules.d/40network/ifup" "/sbin/ifup"
 	dracut_install grep
-	inst ./test-init /sbin/init
+	inst ./test-init.sh /sbin/init
 	find_binary plymouth >/dev/null && dracut_install plymouth
 	(cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
 	cp -a /etc/ld.so.conf* $initdir/etc
@@ -45,7 +45,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sfdisk mke2fs poweroff cp umount
 	inst_hook initqueue 01 ./create-root.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -54,7 +54,7 @@ test_setup() {
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-m "dash lvm mdraid udev-rules base rootfs-block kernel-modules" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod" \
 	-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
@@ -67,12 +67,12 @@ test_setup() {
     grep -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install poweroff shutdown
 	inst_hook emergency 000 ./hard-off.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
-    sudo $basedir/dracut -l -i $TESTDIR/overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-o "plymouth network" \
 	-a "debug" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod" \
diff --git a/test/TEST-12-RAID-DEG/cryptroot-ask b/test/TEST-12-RAID-DEG/cryptroot-ask.sh
index db27c5b8..db27c5b8 100755
--- a/test/TEST-12-RAID-DEG/cryptroot-ask
+++ b/test/TEST-12-RAID-DEG/cryptroot-ask.sh
diff --git a/test/TEST-12-RAID-DEG/test-init b/test/TEST-12-RAID-DEG/test-init.sh
index 62afcee0..62afcee0 100755
--- a/test/TEST-12-RAID-DEG/test-init
+++ b/test/TEST-12-RAID-DEG/test-init.sh
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index 0cf45a4f..500dc507 100755
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -59,7 +59,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
 	initdir=$TESTDIR/overlay/source
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
@@ -69,7 +69,7 @@ test_setup() {
 	inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script"
 	inst "$basedir/modules.d/40network/ifup" "/sbin/ifup"
 	dracut_install grep
-	inst ./test-init /sbin/init
+	inst ./test-init.sh /sbin/init
 	find_binary plymouth >/dev/null && dracut_install plymouth
 	(cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
 	cp -a /etc/ld.so.conf* $initdir/etc
@@ -79,7 +79,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sfdisk mke2fs poweroff cp umount dd grep
 	inst_hook initqueue 01 ./create-root.sh
  	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -88,7 +88,7 @@ test_setup() {
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod" \
 	-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
@@ -107,15 +107,15 @@ test_setup() {
     eval $(grep --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2)
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install poweroff shutdown
 	inst_hook emergency 000 ./hard-off.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
-	inst ./cryptroot-ask /sbin/cryptroot-ask
+	inst ./cryptroot-ask.sh /sbin/cryptroot-ask
         mkdir -p $initdir/etc
         echo "ARRAY /dev/md0 level=raid5 num-devices=3 UUID=$MD_UUID" > $initdir/etc/mdadm.conf
     )
-    sudo $basedir/dracut -l -i $TESTDIR/overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-o "plymouth network" \
 	-a "debug" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod" \
diff --git a/test/TEST-13-ENC-RAID-LVM/cryptroot-ask b/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh
index db27c5b8..db27c5b8 100755
--- a/test/TEST-13-ENC-RAID-LVM/cryptroot-ask
+++ b/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh
diff --git a/test/TEST-13-ENC-RAID-LVM/test-init b/test/TEST-13-ENC-RAID-LVM/test-init.sh
index 6b86561f..6b86561f 100755
--- a/test/TEST-13-ENC-RAID-LVM/test-init
+++ b/test/TEST-13-ENC-RAID-LVM/test-init.sh
diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
index 6e13d376..d6dbde0a 100755
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -60,7 +60,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
 	initdir=$TESTDIR/overlay/source
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
@@ -70,7 +70,7 @@ test_setup() {
 	inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script"
 	inst "$basedir/modules.d/40network/ifup" "/sbin/ifup"
 	dracut_install grep
-	inst ./test-init /sbin/init
+	inst ./test-init.sh /sbin/init
 	find_binary plymouth >/dev/null && dracut_install plymouth
 	(cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
 	cp -a /etc/ld.so.conf* $initdir/etc
@@ -80,7 +80,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install 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
@@ -89,7 +89,7 @@ test_setup() {
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod" \
 	-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
@@ -109,13 +109,13 @@ test_setup() {
 
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install poweroff shutdown
 	inst_hook emergency 000 ./hard-off.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
-	inst ./cryptroot-ask /sbin/cryptroot-ask
+	inst ./cryptroot-ask.sh /sbin/cryptroot-ask
     )
-    sudo $basedir/dracut -l -i $TESTDIR/overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-o "plymouth network" \
 	-a "debug" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod" \
diff --git a/test/TEST-15-BTRFSRAID/test-init b/test/TEST-15-BTRFSRAID/test-init.sh
index 8f7cdf3a..8f7cdf3a 100755
--- a/test/TEST-15-BTRFSRAID/test-init
+++ b/test/TEST-15-BTRFSRAID/test-init.sh
diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
index dfebbed6..f64b2b29 100755
--- 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
     (
 	initdir=$TESTDIR/overlay/source
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
@@ -36,7 +36,7 @@ test_setup() {
 	inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script"
 	inst "$basedir/modules.d/40network/ifup" "/sbin/ifup"
 	dracut_install grep
-	inst ./test-init /sbin/init
+	inst ./test-init.sh /sbin/init
 	find_binary plymouth >/dev/null && dracut_install plymouth
 	(cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
 	cp -a /etc/ld.so.conf* $initdir/etc
@@ -46,7 +46,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sfdisk mkfs.btrfs poweroff cp umount
 	inst_hook initqueue 01 ./create-root.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -55,7 +55,7 @@ test_setup() {
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-m "dash btrfs udev-rules base rootfs-block kernel-modules" \
 	-d "piix ide-gd_mod ata_piix btrfs sd_mod" \
         --nomdadmconf \
@@ -75,13 +75,13 @@ test_setup() {
 
    (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install poweroff shutdown
 	inst_hook emergency 000 ./hard-off.sh
-	inst ./cryptroot-ask /sbin/cryptroot-ask
+	inst ./cryptroot-ask.sh /sbin/cryptroot-ask
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
-    sudo $basedir/dracut -l -i $TESTDIR/overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-o "plymouth network" \
 	-a "debug" \
 	-d "piix ide-gd_mod ata_piix btrfs sd_mod" \
diff --git a/test/TEST-16-DMSQUASH/cryptroot-ask b/test/TEST-16-DMSQUASH/cryptroot-ask.sh
index db27c5b8..db27c5b8 100755
--- a/test/TEST-16-DMSQUASH/cryptroot-ask
+++ b/test/TEST-16-DMSQUASH/cryptroot-ask.sh
diff --git a/test/TEST-16-DMSQUASH/test-init b/test/TEST-16-DMSQUASH/test-init.sh
index 616bf688..616bf688 100755
--- a/test/TEST-16-DMSQUASH/test-init
+++ b/test/TEST-16-DMSQUASH/test-init.sh
diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
index 049a758c..08781192 100755
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
@@ -22,7 +22,7 @@ test_setup() {
     mkdir -p $TESTDIR/overlay
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install poweroff shutdown
 	inst_hook emergency 000 ./hard-off.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -30,7 +30,7 @@ test_setup() {
 
     dd if=/dev/zero of=$TESTDIR/root.img count=100
 
-    sudo $basedir/dracut -l -i $TESTDIR/overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-a "debug dmsquash-live" \
 	-d "piix ide-gd_mod ata_piix ext3 sd_mod" \
 	-f $TESTDIR/initramfs.testing $KVERSION || return 1
@@ -40,7 +40,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
 	initdir=$TESTDIR/root-source
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient \
 	    umount strace less
@@ -54,7 +54,7 @@ test_setup() {
 	for f in /usr/share/syslinux/*; do
 	    inst_simple "$f"
 	done
-	inst ./test-init /sbin/init
+	inst ./test-init.sh /sbin/init
 	inst $TESTDIR/initramfs.testing "/boot/initramfs-$KVERSION.img"
 	inst /boot/vmlinuz-$KVERSION
 	find_binary plymouth >/dev/null && dracut_install plymouth
diff --git a/test/TEST-20-NFS/client-init b/test/TEST-20-NFS/client-init.sh
index f9e6de31..f9e6de31 100755
--- a/test/TEST-20-NFS/client-init
+++ b/test/TEST-20-NFS/client-init.sh
diff --git a/test/TEST-20-NFS/server-init b/test/TEST-20-NFS/server-init.sh
index 26a2abde..26a2abde 100755
--- a/test/TEST-20-NFS/server-init
+++ b/test/TEST-20-NFS/server-init.sh
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 5c136c08..fa72630c 100755
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -211,7 +211,7 @@ test_setup() {
     kernel=$KVERSION
     (
     	initdir=$TESTDIR/mnt
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sh ls shutdown poweroff stty cat ps ln ip \
 	    dmesg mkdir cp ping exportfs \
 	    modprobe rpc.nfsd rpc.mountd showmount tcpdump \
@@ -226,7 +226,7 @@ test_setup() {
 	type -P dhcpd >/dev/null && dracut_install dhcpd
 	[ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
 	instmods nfsd sunrpc ipv6
-	inst ./server-init /sbin/init
+	inst ./server-init.sh /sbin/init
 	inst ./hosts /etc/hosts
 	inst ./exports /etc/exports
 	inst ./dhcpd.conf /etc/dhcpd.conf
@@ -263,14 +263,14 @@ test_setup() {
     mkdir -p $initdir
 
     (
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sh shutdown poweroff stty cat ps ln ip \
             mount dmesg mkdir cp ping grep
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
 	    [ -f ${_terminfodir}/l/linux ] && break
 	done
 	dracut_install -o ${_terminfodir}/l/linux
-	inst ./client-init /sbin/init
+	inst ./client-init.sh /sbin/init
 	(
 	    cd "$initdir"
 	    mkdir -p dev sys proc etc
@@ -298,20 +298,20 @@ test_setup() {
     (
 	initdir=$TESTDIR/overlay
 	mkdir $TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install poweroff shutdown
 	inst_hook emergency 000 ./hard-off.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
 
     # Make server's dracut image
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-m "dash udev-rules base rootfs-block debug kernel-modules" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod e1000" \
 	-f $TESTDIR/initramfs.server $KVERSION || return 1
 
     # Make client's dracut image
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-o "plymouth" \
 	-a "debug" \
 	-d "piix ide-gd_mod ata_piix sd_mod e1000 nfs sunrpc" \
diff --git a/test/TEST-30-ISCSI/client-init b/test/TEST-30-ISCSI/client-init.sh
index 1b9d633f..1b9d633f 100755
--- a/test/TEST-30-ISCSI/client-init
+++ b/test/TEST-30-ISCSI/client-init.sh
diff --git a/test/TEST-30-ISCSI/cryptroot-ask b/test/TEST-30-ISCSI/cryptroot-ask.sh
index db27c5b8..db27c5b8 100755
--- a/test/TEST-30-ISCSI/cryptroot-ask
+++ b/test/TEST-30-ISCSI/cryptroot-ask.sh
diff --git a/test/TEST-30-ISCSI/server-init b/test/TEST-30-ISCSI/server-init.sh
index 6f24b604..6f24b604 100755
--- a/test/TEST-30-ISCSI/server-init
+++ b/test/TEST-30-ISCSI/server-init.sh
diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index 97c0292d..da84335b 100755
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -103,14 +103,14 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
         initdir=$TESTDIR/overlay/source
-        . $basedir/dracut-functions
+        . $basedir/dracut-functions.sh
         dracut_install sh shutdown poweroff stty cat ps ln ip \
             mount dmesg mkdir cp ping grep
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             [ -f ${_terminfodir}/l/linux ] && break
         done
         dracut_install -o ${_terminfodir}/l/linux
-        inst ./client-init /sbin/init
+        inst ./client-init.sh /sbin/init
         (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
         cp -a /etc/ld.so.conf* $initdir/etc
         sudo ldconfig -r "$initdir"
@@ -119,7 +119,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
         initdir=$TESTDIR/overlay
-        . $basedir/dracut-functions
+        . $basedir/dracut-functions.sh
         dracut_install sfdisk mke2fs poweroff cp umount
         inst_hook initqueue 01 ./create-root.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -128,7 +128,7 @@ test_setup() {
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
         -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
         -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
         -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
@@ -154,12 +154,12 @@ test_setup() {
     rm $TESTDIR/client.img
     (
         initdir=$TESTDIR/overlay
-        . $basedir/dracut-functions
+        . $basedir/dracut-functions.sh
         dracut_install poweroff shutdown
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
-    sudo $basedir/dracut -l -i $TESTDIR/overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
         -o "plymouth dmraid" \
         -a "debug" \
         -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
@@ -174,7 +174,7 @@ test_setup() {
     kernel=$KVERSION
     (
         initdir=$TESTDIR/mnt
-        . $basedir/dracut-functions
+        . $basedir/dracut-functions.sh
         (
             cd "$initdir";
             mkdir -p dev sys proc etc var/run tmp var/lib/dhcpd /etc/iscsi
@@ -194,7 +194,7 @@ test_setup() {
         [ -f /etc/netconfig ] && dracut_install /etc/netconfig
         type -P dhcpd >/dev/null && dracut_install dhcpd
         [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
-        inst ./server-init /sbin/init
+        inst ./server-init.sh /sbin/init
         inst ./hosts /etc/hosts
         inst ./dhcpd.conf /etc/dhcpd.conf
         dracut_install /etc/nsswitch.conf /etc/rpc /etc/protocols
@@ -209,7 +209,7 @@ test_setup() {
     rm -fr $TESTDIR/mnt
 
     # Make server's dracut image
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
         -m "dash udev-rules base rootfs-block debug kernel-modules" \
         -d "piix ide-gd_mod ata_piix ext2 sd_mod e1000" \
         -f $TESTDIR/initramfs.server $KVERSION || return 1
diff --git a/test/TEST-40-NBD/client-init b/test/TEST-40-NBD/client-init.sh
index eb65b760..eb65b760 100755
--- a/test/TEST-40-NBD/client-init
+++ b/test/TEST-40-NBD/client-init.sh
diff --git a/test/TEST-40-NBD/cryptroot-ask b/test/TEST-40-NBD/cryptroot-ask.sh
index db27c5b8..db27c5b8 100755
--- a/test/TEST-40-NBD/cryptroot-ask
+++ b/test/TEST-40-NBD/cryptroot-ask.sh
diff --git a/test/TEST-40-NBD/server-init b/test/TEST-40-NBD/server-init.sh
index e8f899c5..e8f899c5 100755
--- a/test/TEST-40-NBD/server-init
+++ b/test/TEST-40-NBD/server-init.sh
diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index 37236052..db757b3a 100755
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -193,14 +193,14 @@ make_encrypted_root() {
 	initdir=$TESTDIR/overlay/source
         mkdir -p "$initdir"
 	(cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install 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 ./client-init /sbin/init
+	inst ./client-init.sh /sbin/init
 	find_binary plymouth >/dev/null && dracut_install plymouth
 	cp -a /etc/ld.so.conf* $initdir/etc
 	sudo ldconfig -r "$initdir"
@@ -209,7 +209,7 @@ make_encrypted_root() {
     # second, install the files needed to make the root filesystem
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install mke2fs poweroff cp umount tune2fs
 	inst_hook initqueue 01 ./create-root.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -218,7 +218,7 @@ make_encrypted_root() {
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
 	-d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod" \
 	-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
@@ -245,7 +245,7 @@ make_client_root() {
     kernel=$KVERSION
     (
 	initdir=$TESTDIR/mnt
-	. $basedir/dracut-functions
+	. $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 \
@@ -254,7 +254,7 @@ make_client_root() {
 	    [ -f ${_terminfodir}/l/linux ] && break
 	done
 	dracut_install -o ${_terminfodir}/l/linux
-	inst ./client-init /sbin/init
+	inst ./client-init.sh /sbin/init
 	inst /etc/nsswitch.conf /etc/nsswitch.conf
 	inst /etc/passwd /etc/passwd
 	inst /etc/group /etc/group
@@ -279,7 +279,7 @@ make_server_root() {
     kernel=$KVERSION
     (
 	initdir=$TESTDIR/mnt
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
         mkdir -p "$initdir"
 	(
 	    cd "$initdir";
@@ -294,7 +294,7 @@ make_server_root() {
 	dracut_install -o ${_terminfodir}/l/linux
 	type -P dhcpd >/dev/null && dracut_install dhcpd
 	[ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
-	inst ./server-init /sbin/init
+	inst ./server-init.sh /sbin/init
 	inst ./hosts /etc/hosts
 	inst ./dhcpd.conf /etc/dhcpd.conf
 	inst /etc/nsswitch.conf /etc/nsswitch.conf
@@ -324,19 +324,19 @@ test_setup() {
     # Make the test image
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install poweroff shutdown
 	inst_hook emergency 000 ./hard-off.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
-	inst ./cryptroot-ask /sbin/cryptroot-ask
+	inst ./cryptroot-ask.sh /sbin/cryptroot-ask
     )
 
-    sudo $basedir/dracut -l -i $TESTDIR/overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-m "dash udev-rules rootfs-block base debug kernel-modules" \
 	-d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \
 	-f $TESTDIR/initramfs.server $KVERSION || return 1
 
-    sudo $basedir/dracut -l -i $TESTDIR/overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-o "plymouth" \
 	-a "debug" \
 	-d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \
diff --git a/test/TEST-50-MULTINIC/client-init b/test/TEST-50-MULTINIC/client-init.sh
index ce5685f9..ce5685f9 100755
--- a/test/TEST-50-MULTINIC/client-init
+++ b/test/TEST-50-MULTINIC/client-init.sh
diff --git a/test/TEST-50-MULTINIC/server-init b/test/TEST-50-MULTINIC/server-init.sh
index 39f6a1da..39f6a1da 100755
--- a/test/TEST-50-MULTINIC/server-init
+++ b/test/TEST-50-MULTINIC/server-init.sh
diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index 43a951ca..712f90ef 100755
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -130,7 +130,7 @@ test_setup() {
      kernel=$KVERSION
      (
      	initdir=$TESTDIR/mnt
- 	. $basedir/dracut-functions
+ 	. $basedir/dracut-functions.sh
  	dracut_install sh ls shutdown poweroff stty cat ps ln ip \
  	    dmesg mkdir cp ping exportfs \
  	    modprobe rpc.nfsd rpc.mountd showmount tcpdump \
@@ -145,7 +145,7 @@ test_setup() {
  	type -P dhcpd >/dev/null && dracut_install dhcpd
  	[ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
  	instmods nfsd sunrpc ipv6
- 	inst ./server-init /sbin/init
+ 	inst ./server-init.sh /sbin/init
  	inst ./hosts /etc/hosts
  	inst ./exports /etc/exports
  	inst ./dhcpd.conf /etc/dhcpd.conf
@@ -191,7 +191,7 @@ test_setup() {
     mkdir -p $initdir
 
     (
- 	. $basedir/dracut-functions
+ 	. $basedir/dracut-functions.sh
  	dracut_install sh shutdown poweroff stty cat ps ln ip \
             mount dmesg mkdir \
  	    cp ping grep ls
@@ -199,7 +199,7 @@ test_setup() {
 	    [ -f ${_terminfodir}/l/linux ] && break
 	done
 	dracut_install -o ${_terminfodir}/l/linux
- 	inst ./client-init /sbin/init
+ 	inst ./client-init.sh /sbin/init
  	(
  	    cd "$initdir"
  	    mkdir -p dev sys proc etc run
@@ -223,20 +223,20 @@ test_setup() {
     (
  	initdir=$TESTDIR/overlay
  	mkdir $TESTDIR/overlay
- 	. $basedir/dracut-functions
+ 	. $basedir/dracut-functions.sh
  	dracut_install poweroff shutdown
  	inst_hook emergency 000 ./hard-off.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
 
     # Make server's dracut image
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-m "dash udev-rules base rootfs-block debug kernel-modules" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod e1000" \
 	-f $TESTDIR/initramfs.server $KVERSION || return 1
 
     # Make client's dracut image
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-o "plymouth" \
 	-a "debug" \
 	-d "piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfs sunrpc" \
diff --git a/test/old.TEST-14-IMSM/cryptroot-ask b/test/old.TEST-14-IMSM/cryptroot-ask.sh
index db27c5b8..db27c5b8 100755
--- a/test/old.TEST-14-IMSM/cryptroot-ask
+++ b/test/old.TEST-14-IMSM/cryptroot-ask.sh
diff --git a/test/old.TEST-14-IMSM/test-init b/test/old.TEST-14-IMSM/test-init.sh
index f434f132..f434f132 100755
--- a/test/old.TEST-14-IMSM/test-init
+++ b/test/old.TEST-14-IMSM/test-init.sh
diff --git a/test/old.TEST-14-IMSM/test.sh b/test/old.TEST-14-IMSM/test.sh
index 8d8c063f..a60e8d53 100755
--- a/test/old.TEST-14-IMSM/test.sh
+++ b/test/old.TEST-14-IMSM/test.sh
@@ -58,7 +58,7 @@ test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
     (
 	initdir=$TESTDIR/overlay/source
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \
 	    mount dmesg ifconfig dhclient mkdir cp ping dhclient
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
@@ -68,7 +68,7 @@ test_setup() {
 	inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script"
 	inst "$basedir/modules.d/40network/ifup" "/sbin/ifup"
 	dracut_install grep
-	inst ./test-init /sbin/init
+	inst ./test-init.sh /sbin/init
 	find_binary plymouth >/dev/null && dracut_install plymouth
 	(cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
 	cp -a /etc/ld.so.conf* $initdir/etc
@@ -79,7 +79,7 @@ test_setup() {
     # second, install the files needed to make the root filesystem
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install sfdisk mke2fs poweroff cp umount
 	inst_hook initqueue 01 ./create-root.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
@@ -88,7 +88,7 @@ test_setup() {
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
-    $basedir/dracut -l -i $TESTDIR/overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-m "dash lvm mdraid dmraid udev-rules base rootfs-block kernel-modules" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod dm-multipath dm-crypt dm-round-robin faulty linear multipath raid0 raid10 raid1 raid456" \
 	-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
@@ -105,12 +105,12 @@ test_setup() {
     grep -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
     (
 	initdir=$TESTDIR/overlay
-	. $basedir/dracut-functions
+	. $basedir/dracut-functions.sh
 	dracut_install poweroff shutdown
 	inst_hook emergency 000 ./hard-off.sh
 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
-    sudo $basedir/dracut -l -i $TESTDIR/overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-o "plymouth network" \
 	-a "debug" \
 	-d "piix ide-gd_mod ata_piix ext2 sd_mod" \