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

8 files changed, 59 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index 1686466..f089fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+initramfs-tools (0.74) unstable; urgency=low
+
+  * scripts/local-premount/resume: Reuse klibc resume, hardcode path as
+    uswsusp shipps too an resume binary in initramfs-tools. Thus tighten
+    again klibc dep to 1.4.11-1. (closes: 381535)
+
+  * mkinitramfs: Readd mdrun when around.
+
+  * scripts/local-top/mdrun: Rename from mdraid. Use mdrun as previously,
+    there is no guarantee that the sarge mdadm works and that the sarge
+    mdadm.conf has any sense.
+
+  * debian/control: Better package description.
+
+  * scripts/local: mountroot add message what to check if root is not found
+    in 2 straight lines to keep as much of scrolling buffer.
+
+  * scripts/functions: Use set ``--'' to change positional paramaters without
+    changing any options. This is useful for the debug bootparam on d?ash.
+
+  * update-initramfs: Respect "do_bootloader = yes" from /etc/kernel-img.conf
+    to call lilo if both lilo and grub are installed. (closes: 382013)
+
+ -- maximilian attems <maks@sternwelten.at>  Thu, 17 Aug 2006 16:50:51 +0200
+
 initramfs-tools (0.73e) unstable; urgency=high
 
   * mkinitramfs: Fix if statement for conf.d. (closes: 382740)
diff --git a/debian/control b/debian/control
index a9d0e90..24d1bdc 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,13 @@ Standards-Version: 3.7.2.0
 
 Package: initramfs-tools
 Architecture: all
-Depends: klibc-utils (>= 1.4.8-0), busybox (>= 1:1.01-3) | busybox-cvs-static (>= 20040623-1), cpio, module-init-tools, udev (>= 0.086-1)
+Depends: klibc-utils (>= 1.4.11-1), busybox (>= 1:1.01-3) | busybox-cvs-static (>= 20040623-1), cpio, module-init-tools, udev (>= 0.086-1)
 Provides: linux-initramfs-tool
 Description: tools for generating an initramfs
- This package contains tools to create and boot an initramfs for prepackaged
- 2.6 Linux kernel. The initramfs is a gzipped cpio archive. At boot time, the
+ This package contains tools to create and boot an initramfs for packaged 2.6
+ Linux kernel. The initramfs is a gzipped cpio archive. At boot time, the
  kernel unpacks that archive into RAM, mounts and uses it as initial root file
- system. From there on the mounting of the real root file system occurs in user
- space. klibc handles the boot-time networking setup. Having the root on NFS
- is also supported.
+ system. The mounting of the real root file system occurs in early user space.
+ klibc provides utilities to setup root. Having the root on EVMS, MD, LVM2,
+ LUKS or NFS is also supported.
  Any boot loader with initrd support is able to load an initramfs archive.
diff --git a/mkinitramfs b/mkinitramfs
index 3df30ec..67d9df0 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -235,6 +235,7 @@ run_scripts "${CONFDIR}"/hooks
 if [ -x /sbin/mdadm -a ! -f /usr/share/initramfs-tools/hooks/mdadm ]; then
 	mdadm --examine --scan > $DESTDIR/conf/mdadm.conf
 	copy_exec /sbin/mdadm /sbin
+	copy_exec /sbin/mdrun /sbin
 	for x in md linear multipath raid0 raid1 raid456 raid5 raid6 raid10; do
 		manual_add_modules ${x}
 	done
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
diff --git a/update-initramfs b/update-initramfs
index ea74136..e7dc586 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -81,11 +81,28 @@ generate_initramfs()
 	fi
 }
 
+# lilo call
+run_lilo()
+{
+	lilo -t > /dev/null
+	if [ $? -eq 0 ]; then
+		lilo
+	fi
+}
+
 # only run lilo if no grub is around
+# or if "do_bootloader = yes" is set
 run_bootloader()
 {
 	if [ -x /sbin/grub -o -e /boot/grub/menu.lst ]; then
 		if [ -e /etc/lilo.conf ]; then
+			do_bootloader=$(awk  '/bootloader/{print $2}' \
+				/etc/kernel-img.conf)
+			if [ "${do_bootloader}" = "yes" ]; then
+				run_lilo
+				return 0
+			fi
+
 			echo
 			echo "WARNING: grub and lilo installed."
 			echo "If you use grub as bootloader everything is fine."
@@ -95,10 +112,7 @@ run_bootloader()
 		return 0
 	fi
 	if [ -e /etc/lilo.conf ]; then
-		lilo -t > /dev/null
-		if [ $? -eq 0 ]; then
-			lilo
-		fi
+		run_lilo
 	fi
 }