initramfs-tools (0.24) breezy; urgency=low

  "Experience is simply the name we give out mistakes."
  - Oscar Wilde

  * hook-functions (auto_add_modules): Add cciss
    (Ubuntu #14177) Thanks Fabionne!

  * scripts/functions (parse_numeric): Noop on empty parameter.
    Fixes LTSP boot failure.  Thanks to Oliver Grawert
    for testing!

  * scripts/local-top/md: Don't run modprobe when raidlvl is unset.
    Run mdadm if raidlvl has ever been set, not just if the most
    recent device checked was part of the raid setup.
    Thanks to Jeff Waugh for the bug report!

  * mkinitramfs: Feed the -o argument through readlink -f to
    get the canonical pathname.

 -- Jeff Bailey <jbailey@ubuntu.com>  Fri, 26 Aug 2005 09:35:32 -0400

5 files changed, 43 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 09bc345..06292ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+initramfs-tools (0.24) breezy; urgency=low
+
+  "Experience is simply the name we give out mistakes."
+  - Oscar Wilde
+
+  * hook-functions (auto_add_modules): Add cciss
+    (Ubuntu #14177) Thanks Fabionne!
+
+  * scripts/functions (parse_numeric): Noop on empty parameter.
+    Fixes LTSP boot failure.  Thanks to Oliver Grawert
+    for testing!
+
+  * scripts/local-top/md: Don't run modprobe when raidlvl is unset.
+    Run mdadm if raidlvl has ever been set, not just if the most
+    recent device checked was part of the raid setup.
+    Thanks to Jeff Waugh for the bug report!
+
+  * mkinitramfs: Feed the -o argument through readlink -f to
+    get the canonical pathname.
+
+ -- Jeff Bailey <jbailey@ubuntu.com>  Fri, 26 Aug 2005 09:35:32 -0400
+
 initramfs-tools (0.23) breezy; urgency=low
 
   "This suspense is terrible. I hope it will last."
@@ -7,31 +29,31 @@ initramfs-tools (0.23) breezy; urgency=low
     to drop to a shell.
     Thanks to Matt Zimmerman for this fix!
 
-  - hook-functions (auto_add_modules): Add atiixp and opti621 to
+  * hook-functions (auto_add_modules): Add atiixp and opti621 to
     the IDE set.
 
-  - hook-functions (dep_add_modules): Detect i2o and add i2o_block
+  * hook-functions (dep_add_modules): Detect i2o and add i2o_block
     (auto_add_modules): Include i2o_block.
 
-  - scripts/functions (i2o_boot_events): New function
+  * 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.
+  * debian/control: Depend on udev.
     Thanks to Alexander Butenko for troubleshooting this with me.
 
-  - init: Move the /dev directory to the root filesystem.
+  * 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.
+  * 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
+  * 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
+  * scripts/local-top/lvm: Cope with -'s in the Volume Group and
     logical volume names. (Ubuntu #13387)
     Thanks to Stephen Shirley for the patch!
 
diff --git a/hook-functions b/hook-functions
index 8ff5267..b189c34 100644
--- a/hook-functions
+++ b/hook-functions
@@ -132,7 +132,7 @@ auto_add_modules()
 	done
 
 	# scsi
-	for x in 3w-9xxx 3w-xxxx a100u2x aacraid ahci aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic ch dc395x dmx3191d dpt_i2o eata fdomain initio ipr ips isp1020 lpfc max_scsi mac53c94 megaraid megaraid_mbox megaraid_mm mesh nsp32 osst qla1280 qla2100 qla2200 qla2300 qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_promise sata_nv sata_qstor sata_sil sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc scsi_mod scsi_transport_fc scsi_transport_iscsi scsi_transport_spi sd_mod sym53c8xx tmscsim; do
+	for x in 3w-9xxx 3w-xxxx a100u2x aacraid ahci aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic cciss ch dc395x dmx3191d dpt_i2o eata fdomain initio ipr ips isp1020 lpfc max_scsi mac53c94 megaraid megaraid_mbox megaraid_mm mesh nsp32 osst qla1280 qla2100 qla2200 qla2300 qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_promise sata_nv sata_qstor sata_sil sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc scsi_mod scsi_transport_fc scsi_transport_iscsi scsi_transport_spi sd_mod sym53c8xx tmscsim; do
 		manual_add_modules ${x}
 	done
 
diff --git a/mkinitramfs b/mkinitramfs
index 7344a03..a93f97c 100644
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -16,7 +16,8 @@ while getopts "d:ko:r:" flag; do
 		fi
 		;;
 	o)
-		outfile="${OPTARG}"
+		touch ${OPTARG}
+		outfile="$(readlink -f ${OPTARG})"
 		;;
 	k)
 		keep="y"
diff --git a/scripts/functions b/scripts/functions
index 956b1c3..4b3b7cf 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -232,6 +232,9 @@ load_modules()
 
 parse_numeric() {
 	case $1 in
+	"")
+		return
+		;;
 	/*)
 		return
 		;;
@@ -248,4 +251,3 @@ parse_numeric() {
 	mknod /dev/root b ${major} ${minor}
 	ROOT=/dev/root
 }
-
diff --git a/scripts/local-top/md b/scripts/local-top/md
index 055e109..c7515fe 100644
--- a/scripts/local-top/md
+++ b/scripts/local-top/md
@@ -16,6 +16,7 @@ prereqs)
 esac
 
 unset raidlvl
+gotraid=n
 
 # Detect raid level
 for x in /dev/hd[a-z][0-9]* /dev/sd[a-z][0-9]*; do
@@ -23,9 +24,12 @@ for x in /dev/hd[a-z][0-9]* /dev/sd[a-z][0-9]*; do
 		continue
 	fi
 	raidlvl=$(mdadm --examine ${x} 2>/dev/null | grep "Level" | sed -e 's/.*Raid Level : \(.*\)/\1/')
-	modprobe -q ${raidlvl} 2>/dev/null
+	if [ "$raidlvl" ]; then
+		modprobe -q ${raidlvl} 2>/dev/null
+		gotraid=y
+	fi
 done
 
-[ x${raidlvl} != x ] || return
+[ "${gotraid}" = y ] || exit
 
 /sbin/mdrun /dev