From 8761821795732a9755d673e92fb45ac9202270df Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Mon, 24 Jul 2006 09:13:28 +0200
Subject: - add BUSYBOX section to conf - add myri10ge, smc911x and hptiop
 modules - fix check_minkver() logic - escape resume variables - fix SEE ALSO
 section in all manpages - source /usr/share/initramfs-tools/conf.d/* - check
 against modules.dep before running depmod - more verbose output - open
 console with -i for dash interactive - fix resume param by LABEL or UUID -
 lvm has new prereq mdadm - update-initramfs fix -v calling -
 functions/scripts replace basename usage with shell expansion

---
 scripts/functions             | 8 ++++++--
 scripts/local-premount/resume | 9 +++++++++
 scripts/local-top/lvm         | 2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/functions b/scripts/functions
index 53e07ca..9e578d7 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -62,7 +62,7 @@ panic()
 	modprobe -q i8042
 	modprobe -q atkbd
 	echo $@
-	PS1='(initramfs) ' /bin/sh </dev/console >/dev/console 2>&1
+	PS1='(initramfs) ' /bin/sh -i </dev/console >/dev/console 2>&1
 }
 
 maybe_break()
@@ -84,7 +84,7 @@ set_initlist()
 		if [ ! -x ${si_x} ]; then
 			continue
 		fi
-		initlist="${initlist} $(basename ${si_x})"
+		initlist="${initlist} ${si_x#${initdir}/}"
 	done
 }
 
@@ -168,6 +168,10 @@ reduce_prereqs()
 call_scripts()
 {
 	for cs_x in ${runlist}; do
+		# mkinitramfs verbose output
+		if [ "${verbose}" = "y" ]; then
+			echo "Calling hook ${cs_x}"
+		fi
 		${initdir}/${cs_x}
 		# allow boot scripts to modify exported boot paramaters
 		if [ -e /conf/param.conf ]; then
diff --git a/scripts/local-premount/resume b/scripts/local-premount/resume
index 059e7a4..564d6f8 100755
--- a/scripts/local-premount/resume
+++ b/scripts/local-premount/resume
@@ -19,6 +19,15 @@ if [ "x${resume}" = "x" ]; then
 	exit
 fi
 
+case $resume in
+	LABEL=*)
+	resume="/dev/disk/by-label/${resume#LABEL=}"
+	;;
+	UUID=*)
+	resume="/dev/disk/by-uuid/${resume#UUID=}"
+	;;
+esac
+
 if [ ! -e "${resume}" ]; then
 	exit
 fi
diff --git a/scripts/local-top/lvm b/scripts/local-top/lvm
index 5323a7d..9a45220 100755
--- a/scripts/local-top/lvm
+++ b/scripts/local-top/lvm
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PREREQ="md"
+PREREQ="mdadm"
 
 prereqs()
 {
-- 
cgit v1.2.3