first prerelease 0.86 + merge 0.85f

* kick mdrun script
* update control for lenny + ubuntu
* add _all_ ide, block and drivers
* use MODPROBE_OPTIONS and kill any modprobed arg
* small doc + whitespace fixes

8 files changed, 29 insertions, 78 deletions

diff --git a/scripts/functions b/scripts/functions
index 7e67771..7ae9c78 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -60,11 +60,11 @@ panic()
 		/sbin/usplash_write "QUIT"
 	fi
 	# Disallow console access
-	if [ "${panic}" = 0 ]; then
+	if [ -n "${panic}" ] && [ "${panic}" = 0 ]; then
 		reboot
 	fi
-	modprobe -q i8042
-	modprobe -q atkbd
+	modprobe i8042
+	modprobe atkbd
 	echo $@
 	PS1='(initramfs) ' /bin/sh -i </dev/console >/dev/console 2>&1
 }
@@ -206,7 +206,7 @@ load_modules()
 			if [ "$com" = "#" ]; then
 				continue
 			fi
-			modprobe -q $m
+			modprobe $m
 		done
 	fi
 }
diff --git a/scripts/init-premount/thermal b/scripts/init-premount/thermal
index bfea1fc..aa146ec 100755
--- a/scripts/init-premount/thermal
+++ b/scripts/init-premount/thermal
@@ -18,20 +18,20 @@ esac
 case "$DPKG_ARCH" in
 # load the right modules
 powerpc|ppc64)
-	modprobe -q i2c-powermac
-	modprobe -q therm_pm72
-	modprobe -q windfarm_cpufreq_clamp
-	modprobe -q windfarm_lm75_sensor
-	modprobe -q windfarm_max6690_sensor
-	modprobe -q windfarm_pm112
-	modprobe -q windfarm_pm81
-	modprobe -q windfarm_pm91
-	modprobe -q windfarm_smu_controls
-	modprobe -q windfarm_smu_sat
-	modprobe -q windfarm_smu_sensors
+	modprobe i2c-powermac
+	modprobe therm_pm72
+	modprobe windfarm_cpufreq_clamp
+	modprobe windfarm_lm75_sensor
+	modprobe windfarm_max6690_sensor
+	modprobe windfarm_pm112
+	modprobe windfarm_pm81
+	modprobe windfarm_pm91
+	modprobe windfarm_smu_controls
+	modprobe windfarm_smu_sat
+	modprobe windfarm_smu_sensors
 	;;
 i386|amd64|ia64)
-	modprobe -q fan
-	modprobe -q thermal
+	modprobe fan
+	modprobe thermal
 	;;
 esac
diff --git a/scripts/init-top/framebuffer b/scripts/init-top/framebuffer
index 7c080f9..c680409 100755
--- a/scripts/init-top/framebuffer
+++ b/scripts/init-top/framebuffer
@@ -59,9 +59,6 @@ parse_video_opts()
 FB=""
 OPTS=""
 
-SPLASH=false;
-VESA=false;
-
 for x in $(cat /proc/cmdline); do
 	case ${x} in
 	splash*)
@@ -89,8 +86,8 @@ matroxfb)
 esac
 
 if [ -n "${FB}" ]; then
-	modprobe -q fbcon
-	modprobe -q ${FB} ${OPTS}
+	modprobe fbcon
+	modprobe ${FB} ${OPTS}
 fi
 
 if [ -e /proc/fb ]; then
diff --git a/scripts/local b/scripts/local
index f4079d5..4e01472 100644
--- a/scripts/local
+++ b/scripts/local
@@ -40,9 +40,9 @@ 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!"
+		echo "ALERT!  ${ROOT} does not exist.  Dropping to a shell!"
+		echo "	Check your root= boot argument (cat /proc/cmdline)"
+		panic "	Check for missing modules (cat /proc/modules), or device files (ls /dev)"
 	done
 
 	# Get the root filesystem type if not set
@@ -67,7 +67,7 @@ mountroot ()
 	fi
 
 	# FIXME This has no error checking
-	modprobe -q ${FSTYPE}
+	modprobe ${FSTYPE}
 
 	# FIXME This has no error checking
 	# Mount root
diff --git a/scripts/local-top/lvm b/scripts/local-top/lvm
index 27053de..4cf48ad 100755
--- a/scripts/local-top/lvm
+++ b/scripts/local-top/lvm
@@ -64,9 +64,9 @@ if [ ! -e /sbin/vgchange ]; then
 	exit 0
 fi
 
-modprobe -q dm-mod
-modprobe -q dm-snapshot
-modprobe -q dm-mirror
+modprobe dm-mod
+modprobe dm-snapshot
+modprobe dm-mirror
 
 activate_vg "$ROOT"
 activate_vg "$resume"
diff --git a/scripts/local-top/mdrun b/scripts/local-top/mdrun
deleted file mode 100755
index f733656..0000000
--- a/scripts/local-top/mdrun
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-PREREQ="udev_helper"
-
-prereqs()
-{
-	echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-	prereqs
-	exit 0
-	;;
-esac
-
-if [ -e /scripts/local-top/mdadm ]; then
-	exit 0
-fi
-
-unset raidlvl
-gotraid=n
-
-# Detect raid level
-for x in /dev/hd[a-z][0-9]* /dev/sd[a-z][0-9]*; do
-	if [ ! -e ${x} ]; then
-		continue
-	fi
-	raidlvl=$(mdadm --examine ${x} 2>/dev/null | grep "Level" | sed -e 's/.*Raid Level : \(.*\)/\1/')
-	if [ "$raidlvl" ]; then
-		modprobe -q ${raidlvl} 2>/dev/null
-		gotraid=y
-	fi
-done
-
-[ "${gotraid}" = y ] || exit
-
-# source the presumed root md and it's info
-. ./conf/mdrun.conf
-
-# assemble root raid first due to initrd-tools compatibility
-mdadm -A ${rootraiddev} -R -u $uuid $devices
-
-# assemble all raid devices
-/sbin/mdrun /dev
diff --git a/scripts/local-top/udev_helper b/scripts/local-top/udev_helper
index 2d4c209..c1694b7 100755
--- a/scripts/local-top/udev_helper
+++ b/scripts/local-top/udev_helper
@@ -19,5 +19,5 @@ esac
 # but might be an old fashioned ISA controller; in which case
 # we need to load ide-generic.
 if [ ! -e "${ROOT}" -o "${ROOT}" = "/dev/root" ]; then
-	modprobe -q ide-generic
+	modprobe ide-generic
 fi
diff --git a/scripts/nfs b/scripts/nfs
index fc869cc..5eb17bf 100644
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -78,9 +78,9 @@ mountroot()
 	run_scripts /scripts/nfs-top
 	[ "$quiet" != "y" ] && log_end_msg
 
-	modprobe -q nfs
+	modprobe nfs
 	# For DHCP
-	modprobe -q af_packet
+	modprobe af_packet
 
 	# Default delay is around 180s
 	# FIXME: add usplash_write info