r262 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-11-09 14:45:14 +0100 (Thu, 09 Nov 2006)
New Revision: 262

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mdadm-raid
   mdadm/trunk/debian/startall
Log:
  all arrays when booting from rescue/live media. It overrides AUTOSTART in
  /etc/default/mdadm and starts arrays even if the variable is set to
  a false value.

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-11-09 13:32:35 UTC (rev 261)
+++ mdadm/trunk/debian/changelog	2006-11-09 13:45:14 UTC (rev 262)
@@ -2,9 +2,11 @@
 
   * Small fixes to mkconf, now returns 255 instead of -1.
   * Added /usr/share/mdadm/startall, a helper script to facilitate starting
-    all arrays when booting from rescue/live media.
+    all arrays when booting from rescue/live media. It overrides AUTOSTART in
+    /etc/default/mdadm and starts arrays even if the variable is set to
+    a false value.
 
- -- martin f. krafft <madduck at debian.org>  Thu,  9 Nov 2006 14:06:26 +0100
+ -- martin f. krafft <madduck at debian.org>  Thu,  9 Nov 2006 14:44:35 +0100
 
 mdadm (2.5.6-1) unstable; urgency=low
 

Modified: mdadm/trunk/debian/mdadm-raid
===================================================================
--- mdadm/trunk/debian/mdadm-raid	2006-11-09 13:32:35 UTC (rev 261)
+++ mdadm/trunk/debian/mdadm-raid	2006-11-09 13:45:14 UTC (rev 262)
@@ -94,7 +94,7 @@
   start)
     PREFIX="Assembling MD array"
 
-    if is_true $AUTOSTART; then
+    if is_true $AUTOSTART || is_true ${MDADM_FORCE_AUTOSTART__:0}; then
       if [ ! -f /proc/mdstat ] && [ -x "$(command -v modprobe)" ] ; then
         modprobe -kq md 2>/dev/null || :
       fi

Modified: mdadm/trunk/debian/startall
===================================================================
--- mdadm/trunk/debian/startall	2006-11-09 13:32:35 UTC (rev 261)
+++ mdadm/trunk/debian/startall	2006-11-09 13:45:14 UTC (rev 262)
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# startall -- starts all existing arrays without requiring mdadm.conf
+# startall -- starts all existing arrays after creating mdadm.conf
+#             overrides the AUTOSTART variable in /etc/default/mdadm
 #
 # Copyright © martin f. krafft <madduck at madduck.net>
 # distributed under the terms of the Artistic Licence 2.0
@@ -25,4 +26,4 @@
   esac
 fi
 
-exec /etc/init.d/mdadm-raid start
+MDADM_FORCE_AUTOSTART__=1 exec /etc/init.d/mdadm-raid start