r282 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-12-08 09:32:53 +0100 (Fri, 08 Dec 2006)
New Revision: 282

Modified:
   mdadm/trunk/debian/TODO
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mdadm.init
   mdadm/trunk/debian/mdadm.postinst
Log:
* Export DAEMON_OPTIONS to /etc/default/mdadm, which gets passed to the
  mdadm daemon on startup from the init.d script. The value is set to
  --syslog by default, and will get incorporated into debconf in a future
  version.

Modified: mdadm/trunk/debian/TODO
===================================================================
--- mdadm/trunk/debian/TODO	2006-12-08 08:14:44 UTC (rev 281)
+++ mdadm/trunk/debian/TODO	2006-12-08 08:32:53 UTC (rev 282)
@@ -26,4 +26,6 @@
 - also only stop those array we started; this can be easily done with
   sentinels in $STATEDIR
 
+- manage DAEMON_OPTIONS with debconf
+
 $Id$

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-12-08 08:14:44 UTC (rev 281)
+++ mdadm/trunk/debian/changelog	2006-12-08 08:32:53 UTC (rev 282)
@@ -5,8 +5,12 @@
     (closes: #402106).
   * Prevent modules from being loaded during initramfs time if no arrays are
     to be assembled at this stage.
+  * Export DAEMON_OPTIONS to /etc/default/mdadm, which gets passed to the
+    mdadm daemon on startup from the init.d script. The value is set to
+    --syslog by default, and will get incorporated into debconf in a future
+    version.
 
- -- martin f. krafft <madduck at debian.org>  Fri,  8 Dec 2006 12:14:07 +0400
+ -- martin f. krafft <madduck at debian.org>  Fri,  8 Dec 2006 12:31:36 +0400
 
 mdadm (2.5.6-6) unstable; urgency=medium
 

Modified: mdadm/trunk/debian/mdadm.init
===================================================================
--- mdadm/trunk/debian/mdadm.init	2006-12-08 08:14:44 UTC (rev 281)
+++ mdadm/trunk/debian/mdadm.init	2006-12-08 08:32:53 UTC (rev 282)
@@ -52,7 +52,7 @@
       mkdir -p $RUNDIR
       set +e
       start-stop-daemon -S -p $PIDFILE -x $MDADM -- \
-        --monitor --pid-file $PIDFILE --daemonise --scan
+        --monitor --pid-file $PIDFILE --daemonise --scan ${DAEMON_OPTIONS:-}
       log_end_msg $?
       set -e
     fi

Modified: mdadm/trunk/debian/mdadm.postinst
===================================================================
--- mdadm/trunk/debian/mdadm.postinst	2006-12-08 08:14:44 UTC (rev 281)
+++ mdadm/trunk/debian/mdadm.postinst	2006-12-08 08:32:53 UTC (rev 282)
@@ -85,6 +85,8 @@
     AUTOCHECK="${RET:-true}"
     db_get mdadm/start_daemon
     START_DAEMON="${RET:-true}"
+    #db_get mdadm/daemon_options
+    [ -n "$DAEMON_OPTIONS" ] || DAEMON_OPTIONS='--syslog'
 
     cat <<_eof > $DEBIANCONFIG
 # mdadm Debian configuration
@@ -115,6 +117,10 @@
 #   should mdadm start the MD monitoring daemon during boot?
 START_DAEMON=$START_DAEMON
 
+# DAEMON_OPTIONS:
+#   additional options to pass to the daemon.
+DAEMON_OPTIONS="$DAEMON_OPTIONS"
+
 # VERBOSE=
 #   if this variable is set to true, mdadm will be a little more verbose e.g.
 #   when creating the initramfs.