Release 0.74:

- scripts/functions: fix debug boot param
- update-initramfs: checkout /etc/kernel-img.conf if lilo and grub is installed
- rename mdraid to mdrun, readd mdrun as it seems to work much better
  with sarge systems
- add an help message for rescue shell
- better package desc

4 files changed, 9 insertions, 9 deletions

diff --git a/scripts/functions b/scripts/functions
index 9e578d7..e9d7a07 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -117,7 +117,7 @@ get_prereqs()
 
 count_unsatisfied()
 {
-	set - ${@}
+	set -- ${@}
 	return ${#}
 }
 
@@ -126,7 +126,7 @@ pop_list_item()
 {
 	item=${1}
 	shift
-	set - ${@}
+	set -- ${@}
 	unset tmppop
 	# Iterate
 	for pop in ${@}; do
@@ -143,7 +143,7 @@ reduce_prereqs()
 {
 	unset runlist
 	set_initlist
-	set - ${initlist}
+	set -- ${initlist}
 	i=$#
 	# Loop until there's no more in the queue to loop through
 	while [ ${i} -ne 0 ]; do
diff --git a/scripts/local b/scripts/local
index 8510088..0b9baab 100644
--- a/scripts/local
+++ b/scripts/local
@@ -33,6 +33,8 @@ mountroot ()
 
 	# We've given up, but we'll let the user fix matters if they can
 	while [ ! -e "${ROOT}" ]; do
+		echo "	Check root= bootarg cat /proc/cmdline"
+		echo "	or missing modules, devices: cat /proc/modules ls /dev"
 		panic "ALERT!  ${ROOT} does not exist.  Dropping to a shell!"
 	done
 
diff --git a/scripts/local-premount/resume b/scripts/local-premount/resume
index 593df78..881af90 100755
--- a/scripts/local-premount/resume
+++ b/scripts/local-premount/resume
@@ -33,8 +33,6 @@ if [ ! -e "${resume}" ]; then
 fi
 
 if [ -e /sys/power/resume ]; then
-#	FIXME: klibc-utils resume needs more tests
-#	resume ${resume}
-	major_minor=$(ls -l ${resume} | awk '{printf "%d:%d", $5, $6}')
-	echo $major_minor >/sys/power/resume
+	# hardcode path, uswsusp ships an resume binary too
+	/bin/resume ${resume}
 fi
diff --git a/scripts/local-top/mdraid b/scripts/local-top/mdrun
index 8649aa4..1b6ca3e 100755
--- a/scripts/local-top/mdraid
+++ b/scripts/local-top/mdrun
@@ -37,5 +37,5 @@ done
 [ "${gotraid}" = y ] || exit
 
 # Assemble all raid devices
-mkdir /dev/md
-mdadm --assemble --config=/conf/mdadm.conf --scan --run --auto=yes
+# FIXME: assemble root raid first due to initrd-tools compatibility
+/sbin/mdrun /dev