From 552ecca6dbf1fcbf765cedf681fdaac32eca9131 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 22 Feb 2012 10:14:17 +0100 Subject: [PATCH] Renamed all shell scripts to *.sh --- Makefile | 26 +++++++++---------- dracut-catimages => dracut-catimages.sh | 0 dracut-functions => dracut-functions.sh | 2 +- dracut-gencmdline => dracut-gencmdline.sh | 0 dracut-logger => dracut-logger.sh | 0 dracut => dracut.sh | 10 +++---- dracut.spec | 4 +-- lsinitrd => lsinitrd.sh | 0 .../10i18n/{console_init => console_init.sh} | 0 modules.d/10i18n/module-setup.sh | 2 +- .../{dhclient-script => dhclient-script.sh} | 0 modules.d/40network/{ifup => ifup.sh} | 0 modules.d/40network/module-setup.sh | 6 ++--- modules.d/40network/{netroot => netroot.sh} | 0 modules.d/50plymouth/module-setup.sh | 2 +- ...ate-initrd => plymouth-populate-initrd.sh} | 0 ...squash-live-root => dmsquash-live-root.sh} | 0 modules.d/90dmsquash-live/module-setup.sh | 2 +- .../90livenet/{livenetroot => livenetroot.sh} | 0 modules.d/90livenet/module-setup.sh | 2 +- modules.d/95fcoe/{fcoe-up => fcoe-up.sh} | 0 modules.d/95fcoe/module-setup.sh | 2 +- modules.d/95iscsi/{iscsiroot => iscsiroot.sh} | 0 modules.d/95iscsi/module-setup.sh | 2 +- modules.d/95nbd/module-setup.sh | 2 +- modules.d/95nbd/{nbdroot => nbdroot.sh} | 0 modules.d/95nbd/parse-nbdroot.sh | 7 ++--- modules.d/95nfs/module-setup.sh | 2 +- modules.d/95nfs/{nfsroot => nfsroot.sh} | 0 modules.d/99base/{init => init.sh} | 0 modules.d/99base/{initqueue => initqueue.sh} | 0 modules.d/99base/{loginit => loginit.sh} | 0 modules.d/99base/module-setup.sh | 6 ++--- modules.d/99shutdown/module-setup.sh | 2 +- .../99shutdown/{shutdown => shutdown.sh} | 0 .../{cryptroot-ask => cryptroot-ask.sh} | 0 .../TEST-01-BASIC/{test-init => test-init.sh} | 0 test/TEST-01-BASIC/test.sh | 12 ++++----- .../{cryptroot-ask => cryptroot-ask.sh} | 0 test/TEST-10-RAID/{test-init => test-init.sh} | 0 test/TEST-10-RAID/test.sh | 14 +++++----- .../{cryptroot-ask => cryptroot-ask.sh} | 0 test/TEST-11-LVM/{test-init => test-init.sh} | 0 test/TEST-11-LVM/test.sh | 12 ++++----- .../{cryptroot-ask => cryptroot-ask.sh} | 0 .../{test-init => test-init.sh} | 0 test/TEST-12-RAID-DEG/test.sh | 14 +++++----- .../{cryptroot-ask => cryptroot-ask.sh} | 0 .../{test-init => test-init.sh} | 0 test/TEST-13-ENC-RAID-LVM/test.sh | 14 +++++----- .../{test-init => test-init.sh} | 0 test/TEST-15-BTRFSRAID/test.sh | 14 +++++----- .../{cryptroot-ask => cryptroot-ask.sh} | 0 .../{test-init => test-init.sh} | 0 test/TEST-16-DMSQUASH/test.sh | 8 +++--- .../{client-init => client-init.sh} | 0 .../{server-init => server-init.sh} | 0 test/TEST-20-NFS/test.sh | 14 +++++----- .../{client-init => client-init.sh} | 0 .../{cryptroot-ask => cryptroot-ask.sh} | 0 .../{server-init => server-init.sh} | 0 test/TEST-30-ISCSI/test.sh | 18 ++++++------- .../{client-init => client-init.sh} | 0 .../{cryptroot-ask => cryptroot-ask.sh} | 0 .../{server-init => server-init.sh} | 0 test/TEST-40-NBD/test.sh | 24 ++++++++--------- .../{client-init => client-init.sh} | 0 .../{server-init => server-init.sh} | 0 test/TEST-50-MULTINIC/test.sh | 14 +++++----- .../{cryptroot-ask => cryptroot-ask.sh} | 0 .../{test-init => test-init.sh} | 0 test/old.TEST-14-IMSM/test.sh | 12 ++++----- 72 files changed, 125 insertions(+), 124 deletions(-) rename dracut-catimages => dracut-catimages.sh (100%) rename dracut-functions => dracut-functions.sh (99%) rename dracut-gencmdline => dracut-gencmdline.sh (100%) rename dracut-logger => dracut-logger.sh (100%) rename dracut => dracut.sh (98%) rename lsinitrd => lsinitrd.sh (100%) rename modules.d/10i18n/{console_init => console_init.sh} (100%) rename modules.d/40network/{dhclient-script => dhclient-script.sh} (100%) rename modules.d/40network/{ifup => ifup.sh} (100%) rename modules.d/40network/{netroot => netroot.sh} (100%) rename modules.d/50plymouth/{plymouth-populate-initrd => plymouth-populate-initrd.sh} (100%) rename modules.d/90dmsquash-live/{dmsquash-live-root => dmsquash-live-root.sh} (100%) rename modules.d/90livenet/{livenetroot => livenetroot.sh} (100%) rename modules.d/95fcoe/{fcoe-up => fcoe-up.sh} (100%) rename modules.d/95iscsi/{iscsiroot => iscsiroot.sh} (100%) rename modules.d/95nbd/{nbdroot => nbdroot.sh} (100%) rename modules.d/95nfs/{nfsroot => nfsroot.sh} (100%) rename modules.d/99base/{init => init.sh} (100%) rename modules.d/99base/{initqueue => initqueue.sh} (100%) rename modules.d/99base/{loginit => loginit.sh} (100%) rename modules.d/99shutdown/{shutdown => shutdown.sh} (100%) rename test/TEST-01-BASIC/{cryptroot-ask => cryptroot-ask.sh} (100%) rename test/TEST-01-BASIC/{test-init => test-init.sh} (100%) rename test/TEST-10-RAID/{cryptroot-ask => cryptroot-ask.sh} (100%) rename test/TEST-10-RAID/{test-init => test-init.sh} (100%) rename test/TEST-11-LVM/{cryptroot-ask => cryptroot-ask.sh} (100%) rename test/TEST-11-LVM/{test-init => test-init.sh} (100%) rename test/TEST-12-RAID-DEG/{cryptroot-ask => cryptroot-ask.sh} (100%) rename test/TEST-12-RAID-DEG/{test-init => test-init.sh} (100%) rename test/TEST-13-ENC-RAID-LVM/{cryptroot-ask => cryptroot-ask.sh} (100%) rename test/TEST-13-ENC-RAID-LVM/{test-init => test-init.sh} (100%) rename test/TEST-15-BTRFSRAID/{test-init => test-init.sh} (100%) rename test/TEST-16-DMSQUASH/{cryptroot-ask => cryptroot-ask.sh} (100%) rename test/TEST-16-DMSQUASH/{test-init => test-init.sh} (100%) rename test/TEST-20-NFS/{client-init => client-init.sh} (100%) rename test/TEST-20-NFS/{server-init => server-init.sh} (100%) rename test/TEST-30-ISCSI/{client-init => client-init.sh} (100%) rename test/TEST-30-ISCSI/{cryptroot-ask => cryptroot-ask.sh} (100%) rename test/TEST-30-ISCSI/{server-init => server-init.sh} (100%) rename test/TEST-40-NBD/{client-init => client-init.sh} (100%) rename test/TEST-40-NBD/{cryptroot-ask => cryptroot-ask.sh} (100%) rename test/TEST-40-NBD/{server-init => server-init.sh} (100%) rename test/TEST-50-MULTINIC/{client-init => client-init.sh} (100%) rename test/TEST-50-MULTINIC/{server-init => server-init.sh} (100%) rename test/old.TEST-14-IMSM/{cryptroot-ask => cryptroot-ask.sh} (100%) rename test/old.TEST-14-IMSM/{test-init => test-init.sh} (100%) diff --git a/Makefile b/Makefile index 6556c0186..a8f9d1bca 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 similarity index 100% rename from dracut-catimages rename to dracut-catimages.sh diff --git a/dracut-functions b/dracut-functions.sh similarity index 99% rename from dracut-functions rename to dracut-functions.sh index e0a08ab2b..17ffd680c 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 similarity index 100% rename from dracut-gencmdline rename to dracut-gencmdline.sh diff --git a/dracut-logger b/dracut-logger.sh similarity index 100% rename from dracut-logger rename to dracut-logger.sh diff --git a/dracut b/dracut.sh similarity index 98% rename from dracut rename to dracut.sh index 526594c45..bcaff62ba 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 3a261737b..48c0dbb21 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 similarity index 100% rename from lsinitrd rename to lsinitrd.sh diff --git a/modules.d/10i18n/console_init b/modules.d/10i18n/console_init.sh similarity index 100% rename from modules.d/10i18n/console_init rename to modules.d/10i18n/console_init.sh diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh index 37c7c0955..a5a338852 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 similarity index 100% rename from modules.d/40network/dhclient-script rename to modules.d/40network/dhclient-script.sh diff --git a/modules.d/40network/ifup b/modules.d/40network/ifup.sh similarity index 100% rename from modules.d/40network/ifup rename to modules.d/40network/ifup.sh diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh index 2f4d93d9f..c91f1648a 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 similarity index 100% rename from modules.d/40network/netroot rename to modules.d/40network/netroot.sh diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh index b78c718be..8a675ec5a 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 similarity index 100% rename from modules.d/50plymouth/plymouth-populate-initrd rename to 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 similarity index 100% rename from modules.d/90dmsquash-live/dmsquash-live-root rename to 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 2a7988af3..1c792f4b1 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 similarity index 100% rename from modules.d/90livenet/livenetroot rename to modules.d/90livenet/livenetroot.sh diff --git a/modules.d/90livenet/module-setup.sh b/modules.d/90livenet/module-setup.sh index 31164fd45..c650ef312 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 similarity index 100% rename from modules.d/95fcoe/fcoe-up rename to modules.d/95fcoe/fcoe-up.sh diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh index e66798b7b..272c83e46 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 similarity index 100% rename from modules.d/95iscsi/iscsiroot rename to modules.d/95iscsi/iscsiroot.sh diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh index 078682c27..b6c1c1f55 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 a6f812fa1..c0f71ccfb 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 similarity index 100% rename from modules.d/95nbd/nbdroot rename to modules.d/95nbd/nbdroot.sh diff --git a/modules.d/95nbd/parse-nbdroot.sh b/modules.d/95nbd/parse-nbdroot.sh index e2376689e..ec9e1f664 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 19d618c3d..ca91951dc 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 similarity index 100% rename from modules.d/95nfs/nfsroot rename to modules.d/95nfs/nfsroot.sh diff --git a/modules.d/99base/init b/modules.d/99base/init.sh similarity index 100% rename from modules.d/99base/init rename to modules.d/99base/init.sh diff --git a/modules.d/99base/initqueue b/modules.d/99base/initqueue.sh similarity index 100% rename from modules.d/99base/initqueue rename to modules.d/99base/initqueue.sh diff --git a/modules.d/99base/loginit b/modules.d/99base/loginit.sh similarity index 100% rename from modules.d/99base/loginit rename to modules.d/99base/loginit.sh diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh index 738af6b57..fd92644ea 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 ae402eff9..659e2cf97 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 similarity index 100% rename from modules.d/99shutdown/shutdown rename to modules.d/99shutdown/shutdown.sh diff --git a/test/TEST-01-BASIC/cryptroot-ask b/test/TEST-01-BASIC/cryptroot-ask.sh similarity index 100% rename from test/TEST-01-BASIC/cryptroot-ask rename to test/TEST-01-BASIC/cryptroot-ask.sh diff --git a/test/TEST-01-BASIC/test-init b/test/TEST-01-BASIC/test-init.sh similarity index 100% rename from test/TEST-01-BASIC/test-init rename to test/TEST-01-BASIC/test-init.sh diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 72dbec8f1..ca7a1fe1d 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 similarity index 100% rename from test/TEST-10-RAID/cryptroot-ask rename to test/TEST-10-RAID/cryptroot-ask.sh diff --git a/test/TEST-10-RAID/test-init b/test/TEST-10-RAID/test-init.sh similarity index 100% rename from test/TEST-10-RAID/test-init rename to test/TEST-10-RAID/test-init.sh diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index 0209edd37..5ebd86956 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 similarity index 100% rename from test/TEST-11-LVM/cryptroot-ask rename to test/TEST-11-LVM/cryptroot-ask.sh diff --git a/test/TEST-11-LVM/test-init b/test/TEST-11-LVM/test-init.sh similarity index 100% rename from test/TEST-11-LVM/test-init rename to test/TEST-11-LVM/test-init.sh diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh index 3c9cd5c7e..78468bb73 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 similarity index 100% rename from test/TEST-12-RAID-DEG/cryptroot-ask rename to 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 similarity index 100% rename from test/TEST-12-RAID-DEG/test-init rename to 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 0cf45a4f8..500dc5078 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 similarity index 100% rename from test/TEST-13-ENC-RAID-LVM/cryptroot-ask rename to 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 similarity index 100% rename from test/TEST-13-ENC-RAID-LVM/test-init rename to 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 6e13d376d..d6dbde0ab 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 similarity index 100% rename from test/TEST-15-BTRFSRAID/test-init rename to test/TEST-15-BTRFSRAID/test-init.sh diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh index dfebbed64..f64b2b293 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 similarity index 100% rename from test/TEST-16-DMSQUASH/cryptroot-ask rename to test/TEST-16-DMSQUASH/cryptroot-ask.sh diff --git a/test/TEST-16-DMSQUASH/test-init b/test/TEST-16-DMSQUASH/test-init.sh similarity index 100% rename from test/TEST-16-DMSQUASH/test-init rename to test/TEST-16-DMSQUASH/test-init.sh diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh index 049a758c2..08781192a 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 similarity index 100% rename from test/TEST-20-NFS/client-init rename to test/TEST-20-NFS/client-init.sh diff --git a/test/TEST-20-NFS/server-init b/test/TEST-20-NFS/server-init.sh similarity index 100% rename from test/TEST-20-NFS/server-init rename to test/TEST-20-NFS/server-init.sh diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 5c136c082..fa72630c4 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 similarity index 100% rename from test/TEST-30-ISCSI/client-init rename to test/TEST-30-ISCSI/client-init.sh diff --git a/test/TEST-30-ISCSI/cryptroot-ask b/test/TEST-30-ISCSI/cryptroot-ask.sh similarity index 100% rename from test/TEST-30-ISCSI/cryptroot-ask rename to test/TEST-30-ISCSI/cryptroot-ask.sh diff --git a/test/TEST-30-ISCSI/server-init b/test/TEST-30-ISCSI/server-init.sh similarity index 100% rename from test/TEST-30-ISCSI/server-init rename to test/TEST-30-ISCSI/server-init.sh diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index 97c0292d9..da84335b4 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 similarity index 100% rename from test/TEST-40-NBD/client-init rename to test/TEST-40-NBD/client-init.sh diff --git a/test/TEST-40-NBD/cryptroot-ask b/test/TEST-40-NBD/cryptroot-ask.sh similarity index 100% rename from test/TEST-40-NBD/cryptroot-ask rename to test/TEST-40-NBD/cryptroot-ask.sh diff --git a/test/TEST-40-NBD/server-init b/test/TEST-40-NBD/server-init.sh similarity index 100% rename from test/TEST-40-NBD/server-init rename to test/TEST-40-NBD/server-init.sh diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index 372360523..db757b3a0 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 similarity index 100% rename from test/TEST-50-MULTINIC/client-init rename to test/TEST-50-MULTINIC/client-init.sh diff --git a/test/TEST-50-MULTINIC/server-init b/test/TEST-50-MULTINIC/server-init.sh similarity index 100% rename from test/TEST-50-MULTINIC/server-init rename to test/TEST-50-MULTINIC/server-init.sh diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index 43a951ca2..712f90efb 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 similarity index 100% rename from test/old.TEST-14-IMSM/cryptroot-ask rename to 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 similarity index 100% rename from test/old.TEST-14-IMSM/test-init rename to 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 8d8c063f7..a60e8d53d 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" \ -- 2.39.5