Move legacy code from mkinitramfs to separate hooks.

4 files changed, 66 insertions, 31 deletions

diff --git a/debian/changelog b/debian/changelog
index 1476018..a20ad86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,11 +9,12 @@ initramfs-tools (0.87) UNRELEASED; urgency=low
 
   [ David Härdeman ]
   * Add support for loading keymaps. (closes: 337663)
+  * Move legacy code from mkinitramfs to separate hooks.
   * Ubuntu merge
     - Use -Qb for for module loading to honor blacklists.
     - Add PS3 module loading functionality.
 
- -- David Härdeman <david@hardeman.nu>  Fri, 13 Apr 2007 20:08:26 +0200
+ -- David Härdeman <david@hardeman.nu>  Fri, 13 Apr 2007 21:01:11 +0200
 
 initramfs-tools (0.86) unstable; urgency=low
 
diff --git a/hooks/legacy-lvm b/hooks/legacy-lvm
new file mode 100755
index 0000000..ffdf038
--- /dev/null
+++ b/hooks/legacy-lvm
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+PREREQ=""
+
+prereqs()
+{
+	echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+# FIXME: Remove this hook after Lenny releases
+if [ -x /sbin/vgchange ] && [ -d /lib/lvm-200 ] \
+	&& [ ! -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
+exit 0
diff --git a/hooks/legacy-mdadm b/hooks/legacy-mdadm
new file mode 100755
index 0000000..66c6d8e
--- /dev/null
+++ b/hooks/legacy-mdadm
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+PREREQ=""
+
+prereqs()
+{
+	echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+# FIXME: Remove this hook after Etch releases
+if [ -x /sbin/mdadm ] && [ ! -f /usr/share/initramfs-tools/hooks/mdadm ]; then
+	# use mkinitrd magic for Sarge backwards compat
+	rootraiddev="$(df / | sed -rne 's,^(/dev/[^[:space:]]+).*,\1,p')"
+	echo "rootraiddev=${rootraiddev}" > ${DESTDIR}/conf/mdrun.conf
+	mdadm=$(mdadm --detail "${rootraiddev}")
+	echo "${mdadm}" | awk '
+		$1 == "Number" && $2 == "Major" { start = 1; next }
+		$1 == "UUID" { print "uuid=" $3; next }
+		!start { next }
+		$2 == 0 && $3 == 0 { next }
+		{ devices = devices " " $NF }
+		END { print "devices='\''" devices "'\''" }' \
+		>> ${DESTDIR}/conf/mdrun.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
+[ -x /sbin/mdrun ] && copy_exec /sbin/mdrun /sbin
+exit 0
diff --git a/mkinitramfs b/mkinitramfs
index 0197937..b3514fc 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -252,36 +252,6 @@ 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 ] && [ ! -f /usr/share/initramfs-tools/hooks/mdadm ]; then
-	# use mkinitrd magic for Sarge backwards compat
-	rootraiddev="$(df / | sed -rne 's,^(/dev/[^[:space:]]+).*,\1,p')"
-	echo "rootraiddev=${rootraiddev}" > ${DESTDIR}/conf/mdrun.conf
-	mdadm=$(mdadm --detail "${rootraiddev}")
-	echo "${mdadm}" | awk '
-		$1 == "Number" && $2 == "Major" { start = 1; next }
-		$1 == "UUID" { print "uuid=" $3; next }
-		!start { next }
-		$2 == 0 && $3 == 0 { next }
-		{ devices = devices " " $NF }
-		END { print "devices='\''" devices "'\''" }' \
-		>> ${DESTDIR}/conf/mdrun.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
-[ -x /sbin/mdrun ] && copy_exec /sbin/mdrun /sbin
-
-# FIXME: Remove this LVM block after Lenny releases
-if [ -x /sbin/vgchange ] && [ -d /lib/lvm-200 ] \
-	&& [ ! -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" /