initramfs-tools (0.23) breezy; urgency=low

  "This suspense is terrible. I hope it will last."
  - Oscar Wilde

  * scripts/local: Quote ${ROOT} so that an empty value causes us
    to drop to a shell.
    Thanks to Matt Zimmerman for this fix!

  - hook-functions (auto_add_modules): Add atiixp and opti621 to
    the IDE set.

  - hook-functions (dep_add_modules): Detect i2o and add i2o_block
    (auto_add_modules): Include i2o_block.

  - scripts/functions (i2o_boot_events): New function
    (load_modules): Call it. (Ubuntu# 13806)
    Thanks to Tollef Fog Heen for the i2o patch!

  - debian/control: Depend on udev.
    Thanks to Alexander Butenko for troubleshooting this with me.

  - init: Move the /dev directory to the root filesystem.
    Handle all the udev bind mounts as needed.
    Make sure input and output is associated with dev/console.

  - scripts/functions (parse_numeric): Exit if we're refering to a path.
    Otherwise override root setting to be /dev/root.
  - init: Call parse_numeric when setting the root variable.
  - scripts/local-top/lvm: When using a numeric root, call vgchange -ay
    Don't attempt to start LVM on regular partitions.
    (Ubuntu #13365, #13778, and some of #13399)

  - scripts/local-top/lvm: Cope with -'s in the Volume Group and
    logical volume names. (Ubuntu #13387)
    Thanks to Stephen Shirley for the patch!

 -- Jeff Bailey <jbailey@ubuntu.com>  Thu, 25 Aug 2005 11:48:15 -0400

initramfs-tools (0.22) breezy; urgency=low

  * Fix argument handling in force_load hook-function
  * Add "sleep 3" to scripts/nfs as a nasty hack around bug #12942

 -- Matt Zimmerman <mdz@ubuntu.com>  Fri, 19 Aug 2005 23:50:16 -0700

4 files changed, 31 insertions, 4 deletions

diff --git a/scripts/functions b/scripts/functions
index 10918f8..956b1c3 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -181,6 +181,15 @@ scsi_boot_events()
 
 }
 
+i2o_boot_events()
+{
+	[ -e /sys/bus/i2o/devices/ ] || return
+
+	for device in /sys/bus/i2o/devices/*; do
+		[ -e ${device}/block ] && modprobe i2o_block
+	done
+}
+
 load_modules()
 {
 	depmod -a
@@ -217,10 +226,15 @@ load_modules()
 	ide_boot_events
 
 	scsi_boot_events
+
+	i2o_boot_events
 }
 
 parse_numeric() {
 	case $1 in
+	/*)
+		return
+		;;
 	*:*)
 		minor=${1#*:}
 		major=${1%:*}
@@ -232,5 +246,6 @@ parse_numeric() {
 	esac
 
 	mknod /dev/root b ${major} ${minor}
+	ROOT=/dev/root
 }
 
diff --git a/scripts/local b/scripts/local
index bcc96ad..539a2a4 100644
--- a/scripts/local
+++ b/scripts/local
@@ -8,7 +8,7 @@ mountroot ()
 	log_end_msg
 
 	# Get the root filesystem type
-	if [ ! -e ${ROOT} ]; then
+	if [ ! -e "${ROOT}" ]; then
 		panic "ALERT!  ${ROOT} does not exist.  Dropping to a shell!"
 	fi
 
diff --git a/scripts/local-top/lvm b/scripts/local-top/lvm
index 4f199de..9307f55 100644
--- a/scripts/local-top/lvm
+++ b/scripts/local-top/lvm
@@ -15,10 +15,21 @@ prereqs)
 	;;
 esac
 
-vg=$(echo ${ROOT} | sed -e 's#/dev/mapper/\(.*\)-.*#\1#')
-
-[ x${vg} != x ] || return
+vg=${ROOT#/dev/mapper/}
 
+case ${vg} in
+	/dev/root)
+		unset vg
+		;;
+	/*)
+		exit 0
+		;;
+esac
+	
 modprobe -q dm-mod
 
+# Cope with -'s in the volume group and node names.
+vg=$(echo ${vg} | sed -e 's#\(.*\)\([^-]\)-[^-].*#\1\2#')
+
 vgchange -ay ${vg}
+
diff --git a/scripts/nfs b/scripts/nfs
index 8149e86..10f8f1d 100644
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -29,6 +29,7 @@ mountroot ()
 		roflag="-o rw"
 	fi
 
+	sleep 3
 	nfsmount ${roflag} ${NFSROOT} ${rootmnt}
 
 	log_begin_msg "Running /scripts/nfs-bottom"