- really add DAC960 + add megaraid_sas

- update TODO
- first take at the panic parsing
- do_bootloader variable is not case sensitive, catch more cases
- if panic is set to 0 reboot and don't open console,
  needs still work for all other values.

6 files changed, 40 insertions, 10 deletions

diff --git a/debian/TODO b/debian/TODO
index 2c2edc0..7b9bf0a 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -5,10 +5,10 @@ TODO
 
  o Eliminate ?udev?, ?klibc?, busybox (-> glibc).
 
- o Support list and dep options
+ o Better heuristics for MODULES=dep option
 
  o Default to dep for PPC - Possibly to detect newworld?
 
- o lilo timeouts handling
+ o udevsettle timeouts handling
 
- o mdadm + lvm2 hooks to their respective packages
+ o lvm2 hooks to their respective packages
diff --git a/debian/changelog b/debian/changelog
index f089fe6..995d76d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+initramfs-tools (0.75) unstable; urgency=high
+
+  * hook-functions: Add megaraid_sas to the scsi list. Thanks Kenshi Muto
+    <kmuto@debian.org>.
+
+  * init: Parse for "panic=<timeout>" bootarg.
+
+  * hook-functions: Immediately call reboot in the panic function if panic=0
+    to disallow any console access for secured boxes. (closes: 378455)
+
+  * debian/TODO: Update to current state
+
+  * update-initramfs: do_bootloader can be set mixed case or upper case.
+    Catch the obvious Yes and YES too.
+
+  * hook-functions: Really include DAC960 driver. Thanks Tim Small
+    <tim@buttersideup.com>. (closes: 383486) 2 module fixes thus urgency high.
+
+ -- maximilian attems <maks@sternwelten.at>  Fri, 18 Aug 2006 15:35:09 +0200
+
 initramfs-tools (0.74) unstable; urgency=low
 
   * scripts/local-premount/resume: Reuse klibc resume, hardcode path as
diff --git a/hook-functions b/hook-functions
index 3175cba..08f396d 100644
--- a/hook-functions
+++ b/hook-functions
@@ -169,12 +169,13 @@ auto_add_modules()
 	scsi)
 		for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci \
 		aic79xx aic7xxx arcmsr ata_piix atari_scsi atp870u BusLogic \
-		cciss ch cpqarray dac960 dc395x dmx3191d dpt_i2o eata fdomain \
+		cciss ch cpqarray DAC960 dc395x dmx3191d dpt_i2o eata fdomain \
 		gdth hptiop ibmvscsic initio ipr ips isp1020 lpfc max_scsi \
-		mac53c94 megaraid megaraid_mbox megaraid_mm mesh mptfc \
-		mptscsih mptsas mptspi nsp32 osst qla1280 qla2100 qla2200 \
-		qla2300 qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_mv \
-		sata_nv sata_promise sata_qstor sata_sil sata_sis sata_svw \
+		mac53c94 megaraid megaraid_mbox megaraid_mm megaraid_sas \
+		mesh mptfc mptscsih mptsas mptspi nsp32 osst qla1280 \
+		qla2100 qla2200 qla2300 qla2322 qla2xxx qla6312 \
+		qlogicfas408 qlogicfc sata_mv sata_nv sata_promise \
+		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 zfcp; do
diff --git a/init b/init
index 69d9542..ab679b5 100755
--- a/init
+++ b/init
@@ -43,6 +43,7 @@ export readonly=y
 export rootmnt=/root
 export debug=
 export cryptopts=${CRYPTOPTS}
+export panic
 
 for x in $(cat /proc/cmdline); do
 	case $x in
@@ -81,6 +82,9 @@ for x in $(cat /proc/cmdline); do
 	noresume)
 		NORESUME=y
 		;;
+	panic=*)
+		panic="${x#panic=}"
+		;;
 	quiet)
 		quiet=y
 		;;
diff --git a/scripts/functions b/scripts/functions
index e9d7a07..178ad5d 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -59,6 +59,10 @@ panic()
 	if [ -x /sbin/usplash_write ]; then
 		/sbin/usplash_write "QUIT"
 	fi
+	# Disallow console access
+	if [ "${panic}" = 0 ]; then
+		reboot
+	fi
 	modprobe -q i8042
 	modprobe -q atkbd
 	echo $@
diff --git a/update-initramfs b/update-initramfs
index e7dc586..3ce8f1f 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -96,9 +96,10 @@ 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}' \
+			do_b=$(awk  '/bootloader/{print $2}' \
 				/etc/kernel-img.conf)
-			if [ "${do_bootloader}" = "yes" ]; then
+			if [ "${do_b}" = "yes" ] || [ "${do_b}" = "Yes" ] \
+				|| [ "${do_b}" = "YES" ]; then
 				run_lilo
 				return 0
 			fi