r323 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2007-05-05 18:35:16 +0000 (Sat, 05 May 2007)
New Revision: 323

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mkconf
Log:
mkconf now tries to preserve existing values for DEVICE, CREATE and HOMEHOST (in addition to MAILADDR, which it preserved previously already).

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2007-05-05 14:14:40 UTC (rev 322)
+++ mdadm/trunk/debian/changelog	2007-05-05 18:35:16 UTC (rev 323)
@@ -5,6 +5,8 @@
     resuming/freezing. The arrays will automatically sync as soon something
     writes to it; thanks to Tim Dijkstra, Neil Brown, and Luis Rodrigo
     Gallardo Cruz (closes: #415441).
+  * mkconf now tries to preserve existing values for DEVICE, CREATE and
+    HOMEHOST (in addition to MAILADDR, which it preserved previously already).
 
  -- martin f. krafft <madduck at debian.org>  Sat, 05 May 2007 16:12:29 +0200
 

Modified: mdadm/trunk/debian/mkconf
===================================================================
--- mdadm/trunk/debian/mkconf	2007-05-05 14:14:40 UTC (rev 322)
+++ mdadm/trunk/debian/mkconf	2007-05-05 18:35:16 UTC (rev 323)
@@ -22,9 +22,16 @@
   MAILADDR="$MDADM_MAILADDR__"
 else
   # preserve existing MAILADDR
-  MAILADDR="$(sed -ne 's/MAILADDR //p' $CONFIG 2>/dev/null || echo root)"
+  MAILADDR="$(sed -ne 's/^MAILADDR //p' $CONFIG 2>/dev/null)"
 fi
 
+# save existing values as defaults
+if [ -r "$CONFIG" ]; then
+  DEVICE="$(sed -ne 's/^DEVICE //p' $CONFIG)"
+  CREATE="$(sed -ne 's/^CREATE //p' $CONFIG)"
+  HOMEHOST="$(sed -ne 's/^HOMEHOST //p' $CONFIG)"
+fi
+
 generate=0
 [ "${1:-}" = force-generate ] && rm -f $CONFIG
 case "${1:-}" in
@@ -50,16 +57,16 @@
 
 # by default, scan all partitions (/proc/partitions) for MD superblocks.
 # alternatively, specify devices to scan, using wildcards if desired.
-DEVICE partitions
+DEVICE ${DEVICE:-partitions}
 
 # auto-create devices with Debian standard permissions
-CREATE owner=root group=disk mode=0660 auto=yes
+CREATE ${CREATE:-owner=root group=disk mode=0660 auto=yes}
 
 # automatically tag new arrays as belonging to the local system
-HOMEHOST <system>
+HOMEHOST ${HOMEHOST:-<system>}
 
 # instruct the monitoring daemon where to send mail alerts
-MAILADDR $MAILADDR
+MAILADDR ${MAILADDR:-root}
 
 _eof