r284 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-12-12 10:16:48 +0100 (Tue, 12 Dec 2006)
New Revision: 284

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mdadm.postinst
Log:
use -y instead of --syslog (see #402457)

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-12-12 09:12:57 UTC (rev 283)
+++ mdadm/trunk/debian/changelog	2006-12-12 09:16:48 UTC (rev 284)
@@ -7,12 +7,12 @@
     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
+    -y/--syslog by default, and will get incorporated into debconf in a future
     version.
   * Added Spanish debconf translation by Javier Fernández-Sanguino
     (closes: #402681).
 
- -- martin f. krafft <madduck at debian.org>  Tue, 12 Dec 2006 10:09:34 +0100
+ -- martin f. krafft <madduck at debian.org>  Tue, 12 Dec 2006 10:14:41 +0100
 
 mdadm (2.5.6-6) unstable; urgency=medium
 

Modified: mdadm/trunk/debian/mdadm.postinst
===================================================================
--- mdadm/trunk/debian/mdadm.postinst	2006-12-12 09:12:57 UTC (rev 283)
+++ mdadm/trunk/debian/mdadm.postinst	2006-12-12 09:16:48 UTC (rev 284)
@@ -86,7 +86,8 @@
     db_get mdadm/start_daemon
     START_DAEMON="${RET:-true}"
     #db_get mdadm/daemon_options
-    [ -n "$DAEMON_OPTIONS" ] || DAEMON_OPTIONS='--syslog'
+    [ -n "${DAEMON_OPTIONS:-}" ] || DAEMON_OPTIONS='-y'
+    # see #402457 for reason to use -y instead of --syslog
 
     cat <<_eof > $DEBIANCONFIG
 # mdadm Debian configuration