summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2005-10-24 10:06:15 +0200
committermaximilian attems <maks@debian.org>2005-10-24 10:06:15 +0200
commitab1f8ff4ccf955184a61d1dde6a5891c790b864e (patch)
tree4368f7e1f6f09f7b91ad33530f6d51d30453f907
parent3c777488c38d22c88ca9ca0547e48173aeee1fa7 (diff)
downloadinitramfs-tools-ab1f8ff4ccf955184a61d1dde6a5891c790b864e.tar.gz
initramfs-tools-ab1f8ff4ccf955184a61d1dde6a5891c790b864e.zip
add hooks/md with the needed bits.
next step will be to remove deps.
-rw-r--r--debian/changelog6
-rw-r--r--hook-functions4
-rwxr-xr-xhooks/md28
-rwxr-xr-xmkinitramfs4
4 files changed, 34 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 37b3509..399560d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,11 @@ initramfs-tools (0.35) unstable; urgency=low
* Change name of virtual package that is provided into linux-initramfs-tool.
- * Add hooks/lvm, those remove dependency on lvm2.
+ * Add hooks/lvm allowing to remove dependency on lvm2.
- -- maximilian attems <maks@sternwelten.at> Mon, 24 Oct 2005 09:38:41 +0200
+ * Add hooks/md allowing to remove dependency on mdadm.
+
+ -- maximilian attems <maks@sternwelten.at> Mon, 24 Oct 2005 09:49:48 +0200
initramfs-tools (0.32) unstable; urgency=low
diff --git a/hook-functions b/hook-functions
index 0eab2a2..d222d97 100644
--- a/hook-functions
+++ b/hook-functions
@@ -63,7 +63,7 @@ dep_add_modules()
{
# Things that are too hard to autodetect.
- for x in md raid0 raid1 raid5 raid6 ext2 ext3 isofs jfs nfs reiserfs xfs af_packet; do
+ for x in ext2 ext3 isofs jfs nfs reiserfs xfs af_packet; do
manual_add_modules "${x}"
done
@@ -99,7 +99,7 @@ dep_add_modules()
auto_add_modules()
{
# base
- for x in md raid0 raid1 raid5 raid6 ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 ext3 isofs jfs nfs reiserfs xfs af_packet; do
+ for x in ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 ext3 isofs jfs nfs reiserfs xfs af_packet; do
manual_add_modules "${x}"
done
diff --git a/hooks/md b/hooks/md
new file mode 100755
index 0000000..c06b46b
--- /dev/null
+++ b/hooks/md
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+PREREQ=""
+
+prereqs()
+{
+ echo "$PREREQ"
+}
+
+case $1 in
+prereqs)
+ prereqs
+ exit 0
+ ;;
+esac
+
+if [ ! -x /sbin/mdadm ]; then
+ exit 0
+fi
+
+. /usr/share/initramfs-tools/hook-functions
+
+cp /sbin/mdadm "${DESTDIR}/sbin"
+cp /sbin/mdrun "${DESTDIR}/sbin"
+
+for x in md raid0 raid1 raid5 raid6; do
+ manual_add_modules ${x}
+done
diff --git a/mkinitramfs b/mkinitramfs
index 5b48a9d..41f45a7 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -185,10 +185,6 @@ cp /sbin/rmmod "${DESTDIR}/sbin"
mkdir -p "${DESTDIR}/etc/modprobe.d"
cp /etc/modprobe.d/aliases "${DESTDIR}/etc/modprobe.d"
-# Raid
-cp /sbin/mdadm "${DESTDIR}/sbin"
-cp /sbin/mdrun "${DESTDIR}/sbin"
-
run_scripts /usr/share/initramfs-tools/hooks
run_scripts /etc/mkinitramfs/hooks