martin f. krafft: store md.conf file in conf.d subdir in initramfs

[Martin F. Krafft]

Module: mdadm
Branch: build
Commit: 2588738a85b4d3f846b42f84596fa798ee535560
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=2588738a85b4d3f846b42f84596fa798ee535560

Author: martin f. krafft <madduck at madduck.net>
Date:   Wed Jul  2 12:23:48 2008 +0200

store md.conf file in conf.d subdir in initramfs

---

 debian/initramfs/hook             |    2 +-
 debian/initramfs/script.local-top |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/initramfs/hook b/debian/initramfs/hook
index 21a12b7..1d4e90d 100644
--- a/debian/initramfs/hook
+++ b/debian/initramfs/hook
@@ -89,7 +89,7 @@ INITRDSTART=all
 [ -z "$INITRDSTART" ] && INITRDSTART=none
 
 DESTMDADMCONF=$DESTDIR/etc/mdadm/mdadm.conf
-DESTCONFIG=$DESTDIR/conf/md.conf
+DESTCONFIG=$DESTDIR/conf/conf.d/md
 
 # save the homehost for now, even if we don't use it yet
 if [ -f $CONFIG ]; then
diff --git a/debian/initramfs/script.local-top b/debian/initramfs/script.local-top
index 21fd423..195feea 100644
--- a/debian/initramfs/script.local-top
+++ b/debian/initramfs/script.local-top
@@ -41,7 +41,7 @@ verbose()
 
 MD_DEVS=all
 MD_MODULES='linear multipath raid0 raid1 raid456 raid5 raid6 raid10'
-[ -s /conf/md.conf ] && . /conf/md.conf
+[ -s /conf/conf.d/md ] && . /conf/conf.d/md
 
 verbose && log_begin_msg Loading MD modules
 for module in ${MD_MODULES:-}; do