r261 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-11-09 14:32:35 +0100 (Thu, 09 Nov 2006)
New Revision: 261

Added:
   mdadm/trunk/debian/startall
Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mkconf
   mdadm/trunk/debian/rules
Log:
* 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.

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-11-08 23:53:30 UTC (rev 260)
+++ mdadm/trunk/debian/changelog	2006-11-09 13:32:35 UTC (rev 261)
@@ -1,3 +1,11 @@
+mdadm (2.5.6-2) unstable; urgency=low
+
+  * 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.
+
+ -- martin f. krafft <madduck at debian.org>  Thu,  9 Nov 2006 14:06:26 +0100
+
 mdadm (2.5.6-1) unstable; urgency=low
 
   * New upstream release:

Modified: mdadm/trunk/debian/mkconf
===================================================================
--- mdadm/trunk/debian/mkconf	2006-11-08 23:53:30 UTC (rev 260)
+++ mdadm/trunk/debian/mkconf	2006-11-09 13:32:35 UTC (rev 261)
@@ -33,7 +33,7 @@
     # only barf if the config file specifies anything else than MAILADDR
     if egrep -qv '^(MAILADDR.*|#.*|)$' $CONFIG 2>/dev/null; then
       echo "E: $ME: $CONFIG already exists." >&2
-      exit -1
+      exit 255
     fi
     
     mkdir --parent ${CONFIG%/*}

Modified: mdadm/trunk/debian/rules
===================================================================
--- mdadm/trunk/debian/rules	2006-11-08 23:53:30 UTC (rev 260)
+++ mdadm/trunk/debian/rules	2006-11-09 13:32:35 UTC (rev 261)
@@ -82,6 +82,7 @@
 
 	install -m0755 debian/mkconf $(DESTDIR)/usr/share/mdadm
 	install -m0755 debian/checkarray $(DESTDIR)/usr/share/mdadm
+	install -m0755 debian/startall $(DESTDIR)/usr/share/mdadm
 	install -m0755 debian/bugscript $(DESTDIR)/usr/share/bug/mdadm/script
 
 	install -m0644 debian/mdadm.lintian-overrides \

Added: mdadm/trunk/debian/startall
===================================================================
--- mdadm/trunk/debian/startall	2006-11-08 23:53:30 UTC (rev 260)
+++ mdadm/trunk/debian/startall	2006-11-09 13:32:35 UTC (rev 261)
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# startall -- starts all existing arrays without requiring mdadm.conf
+#
+# Copyright © martin f. krafft <madduck at madduck.net>
+# distributed under the terms of the Artistic Licence 2.0
+#
+# $Id$
+#
+
+set -eu
+
+CONFIG=/etc/mdadm/mdadm.conf
+ALTCONFIG=/etc/mdadm.conf
+
+if [ ! -f $CONFIG ] && [ ! -f $ALTCONFIG ]; then
+  /usr/share/mdadm/mkconf generate $CONFIG || ret=$?
+  case ${ret:-0} in
+    0) :;;
+    255) echo W: mdadm: using existing mdadm.conf file... >&2;;
+    *)
+      echo E: mdadm: mdadm.conf creation failed, aborting. >&2
+      exit $ret
+      ;;
+  esac
+fi
+
+exec /etc/init.d/mdadm-raid start


Property changes on: mdadm/trunk/debian/startall
___________________________________________________________________
Name: svn:keywords
   + Id