summaryrefslogtreecommitdiff
path: root/debian/initramfs/script.local-top
diff options
context:
space:
mode:
authormadduck <madduck@3cfab66f-1918-0410-86b3-c06b76f9a464>2006-08-20 22:13:17 +0000
committermadduck <madduck@3cfab66f-1918-0410-86b3-c06b76f9a464>2006-08-20 22:13:17 +0000
commit958d13b52a1288aab05a91c58191745b0b084d36 (patch)
tree88325058b5453dbf3642bcc076a91508b28a9b2b /debian/initramfs/script.local-top
parent091b7aaab735b641c03f9b4a8a56a6dd377caa7d (diff)
more safety
Diffstat (limited to 'debian/initramfs/script.local-top')
-rw-r--r--debian/initramfs/script.local-top12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/initramfs/script.local-top b/debian/initramfs/script.local-top
index 8146c6d7..eecbed6a 100644
--- a/debian/initramfs/script.local-top
+++ b/debian/initramfs/script.local-top
@@ -46,11 +46,6 @@ MD_DEVS=all
MD_MODULES='linear multipath raid0 raid1 raid456 raid5 raid6 raid10'
[ -s /conf/md.conf ] && . /conf/md.conf
-CONFIG=/etc/mdadm/mdadm.conf
-# this really should not be needed, but also doesn't hurt.
-[ -e $CONFIG ] || \
- $MDADM --examine --scan --config=partitions > $CONFIG
-
verbose && log_begin_msg Loading MD modules
for module in ${MD_MODULES:-}; do
if modprobe --syslog "$module"; then
@@ -69,6 +64,11 @@ fi
# handle /dev/md/X nodes
mkdir --parent /dev/md
+CONFIG=/etc/mdadm/mdadm.conf
+# this really should not be needed, but also doesn't hurt.
+[ -e $CONFIG ] || \
+ $MDADM --examine --scan --config=partitions > $CONFIG
+
if [ "$MD_DEVS" = all ]; then
verbose && log_begin_msg "Assembling all MD arrays"
@@ -84,7 +84,7 @@ if [ "$MD_DEVS" = all ]; then
verbose && log_end_msg
-else
+elif [ "$MD_DEVS" != none ]; then
for dev in $MD_DEVS; do
verbose && log_begin_msg "Assembling MD array $dev"