- take care of partial mdadm/lvm Sarge upgrades

  this compat stuff can go once Etch is released
- framebuffer stuff for usplash
- don't leave modules file behind - thanks piuparts!

7 files changed, 143 insertions, 28 deletions

diff --git a/debian/changelog b/debian/changelog
index e6f271b..a43c6b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+initramfs-tools (0.73) unstable; urgency=high
+
+  * debian/initramfs-tools.postrm: Don't forget to remove config file
+    modules on purge. Thanks piuparts verification.
+
+  * mkinitramfs: Add sections that deals with sarge mdadm and lvm2.
+    Does nothing if etch package hooks are installed, will be dropped
+    postetch as then we upgrade from mdadm and lvm2 packages with hooks.
+    Taken from Dapper initramfs-tools-0.40ubuntu32. Adapt to add more
+    modules and no need for mdrun.
+
+  * hooks/lvm: Remove handled by mkinitramfs itself.
+
+  * scripts/local-top/lvm: Add prereqs lvm2 + mdraid. Exit if lvm2 hook is
+    present. Eases transition of lvm hooks to lvm2.
+
+  * scripts/local-top/mdraid: Enable all raid devices. Add mdadm as prereqs.
+    Only run if no mdadm hook is in initramfs. (closes: 380089)
+
+  * urgency high upload to get RC fixes into testing.
+
+ -- maximilian attems <maks@sternwelten.at>  Sat, 29 Jul 2006 13:35:43 +0200
+
+initramfs-tools (0.72) unstable; urgency=low
+
+  * Add scripts/init-top/framebuffer, reduces ubuntu diff even more.
+    fb is only activated with splash or vga boot param.
+  * Upload sponsored by Petter Reinholdtsen.
+
+ -- maximilian attems <maks@sternwelten.at>  Tue, 25 Jul 2006 09:11:18 +0200
+
+initramfs-tools (0.71b) unstable; urgency=low
+
+  * This time caught on bzr dotfiles, removed.
+    Thanks a lot to Frederik Schüler <fs@debian.org> for review.
+
+ -- maximilian attems <maks@sternwelten.at>  Mon, 24 Jul 2006 15:06:04 +0200
+
 initramfs-tools (0.71) unstable; urgency=low
 
   * initramfs.conf.5, initramfs-tools.8, mkinitramfs.8, mkinitramfs-kpkg.8,
diff --git a/debian/initramfs-tools.postrm b/debian/initramfs-tools.postrm
index b2f40bd..6896636 100644
--- a/debian/initramfs-tools.postrm
+++ b/debian/initramfs-tools.postrm
@@ -2,6 +2,7 @@
 
 if [ "x${1}" = "xpurge" ]; then
 	rm -f /etc/initramfs-tools/conf.d/resume
+	rm -f /etc/initramfs-tools/modules
 fi
 
 #DEBHELPER#
diff --git a/hooks/lvm b/hooks/lvm
deleted file mode 100755
index 49a8887..0000000
--- a/hooks/lvm
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-
-prereqs()
-{
-	echo "$PREREQ"
-}
-
-case $1 in
-prereqs)
-	prereqs
-	exit 0
-	;;
-esac
-
-if [ ! -x /sbin/vgchange -a ! -d /lib/lvm-200 ]; then
-	exit 0
-fi
-
-. /usr/share/initramfs-tools/hook-functions
-
-copy_exec /lib/lvm-200/vgchange /sbin
-
-for x in dm_mod dm_snapshot dm_mirror; do
-	manual_add_modules ${x}
-done
diff --git a/mkinitramfs b/mkinitramfs
index 52dea45..799b77e 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -228,6 +228,23 @@ cp -a /etc/modprobe.d/* "${DESTDIR}/etc/modprobe.d"
 run_scripts /usr/share/initramfs-tools/hooks
 run_scripts "${CONFDIR}"/hooks
 
+# FIXME: Remove this Raid block after Etch releases
+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
+	for x in md linear multipath raid0 raid1 raid456 raid5 raid6 raid10; do
+		manual_add_modules ${x}
+	done
+fi
+
+# FIXME: Remove this LVM block after Etch releases
+if [ -x /sbin/vgchange -a -d /lib/lvm-200 -a ! -f /usr/share/initramfs-tools/hooks/lvm2 ]; then
+	copy_exec /lib/lvm-200/vgchange /sbin
+	for x in dm_mod dm_snapshot dm_mirror; do
+		manual_add_modules ${x}
+	done
+fi
+
 # Apply DSDT to initramfs
 if [ -e "${CONFDIR}/DSDT.aml" ]; then
 	copy_exec "${CONFDIR}/DSDT.aml" /
diff --git a/scripts/init-top/framebuffer b/scripts/init-top/framebuffer
new file mode 100755
index 0000000..4f0ab62
--- /dev/null
+++ b/scripts/init-top/framebuffer
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+PREREQ=""
+prereqs()
+{
+	echo "$PREREQ"
+}
+case $1 in
+# get pre-requisites
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+SPLASH=false;
+VESA=false;
+
+for x in $(cat /proc/cmdline); do
+	case $x in
+	splash*)
+		SPLASH=true;
+		;;
+	vga=*)
+		VESA=true;
+		;;
+	esac
+done
+
+if [ $SPLASH = "true" -o $VESA = "true" ]; then
+	modprobe -q fbcon
+	if [ $VESA = "true" ]; then
+		modprobe -q vesafb
+	else
+		modprobe -q vga16fb
+	fi
+	mknod /dev/fb0 c 29 0
+	for i in 0 1 2 3 4 5 6 7 8; do
+		mknod /dev/tty$i c 4 $i
+	done
+fi
diff --git a/scripts/local-top/lvm b/scripts/local-top/lvm
index 9a45220..f9d1490 100755
--- a/scripts/local-top/lvm
+++ b/scripts/local-top/lvm
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PREREQ="mdadm"
+PREREQ="mdadm mdraid lvm2"
 
 prereqs()
 {
@@ -56,6 +56,10 @@ activate_vg()
 	vgchange -ay ${vg}
 }
 
+if [ -e /scripts/local-top/lvm2 ]; then
+	exit 0
+fi
+
 if [ ! -e /sbin/vgchange ]; then
 	exit 0
 fi
diff --git a/scripts/local-top/mdraid b/scripts/local-top/mdraid
new file mode 100755
index 0000000..2cf3b5d
--- /dev/null
+++ b/scripts/local-top/mdraid
@@ -0,0 +1,41 @@
+#!/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
+
+# Assemble all raid devices
+mkdir /dev/md
+mdadm --assemble --config=/etc/mdadm.conf --scan --run --auto=yes