release 0.87b: cleanup legacy hooks

- remove legacymdadm
- source hook-functions in legacylvm

2 files changed, 2 insertions, 38 deletions

diff --git a/hooks/legacylvm b/hooks/legacylvm
index ffdf038..9121f90 100755
--- a/hooks/legacylvm
+++ b/hooks/legacylvm
@@ -16,6 +16,8 @@ prereqs)
 esac
 
 # FIXME: Remove this hook after Lenny releases
+. /usr/share/initramfs-tools/hook-functions
+
 if [ -x /sbin/vgchange ] && [ -d /lib/lvm-200 ] \
 	&& [ ! -f /usr/share/initramfs-tools/hooks/lvm2 ]; then
 	copy_exec /lib/lvm-200/vgchange /sbin
diff --git a/hooks/legacymdadm b/hooks/legacymdadm
deleted file mode 100755
index 66c6d8e..0000000
--- a/hooks/legacymdadm
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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