summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2014-10-04 18:06:14 +0400
committerMichael Tokarev <mjt@tls.msk.ru>2014-10-04 20:32:00 +0400
commit47db9cc7c7c53ddc81f03803575e39f605f99633 (patch)
treeec382252fa405ca0e0920d1a7abbaee244d3749c /debian
parentebd9fdb4efd324a3f7b7b11cea6664d38b7014f1 (diff)
removed references to MAIL_TO from /etc/default/mdadm
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/mdadm.config8
-rw-r--r--debian/mdadm.postinst4
3 files changed, 1 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index 8b8fa498..f6e5337c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mdadm (3.3.2-2) UNRELEASED; urgency=medium
* do not embed $VERSION to mkconf and bugscript
* removed unneeded lintian-overrides file
* removed examples/mdadd.sh
+ * removed references to MAIL_TO from /etc/default/mdadm (pre-2.x mdadm)
-- Michael Tokarev <mjt@tls.msk.ru> Sat, 04 Oct 2014 15:43:57 +0400
diff --git a/debian/mdadm.config b/debian/mdadm.config
index 2cf4f4b8..9f0a080b 100644
--- a/debian/mdadm.config
+++ b/debian/mdadm.config
@@ -27,14 +27,6 @@ if [ -s $DEBIANCONFIG ] ; then
MAILADDR=$(sed -rne 's/^MAILADDR[[:space:]]*([^[:space:]]+).*/\1/p' $CONFIG)
fi
- # if $MAIL_TO from $DEBIANCONFIG is set, give it priority. This is because
- # it was used in the command line invocation of the mdadm monitor, and thus
- # overruled any existing setting in /etc/mdadm/mdadm.conf.
- # There's a slight chance of loss of a configuration setting (MAILADDR in
- # /etc/mdadm/mdadm.conf), but it's only an email address, and it is likely
- # unused anyway, thus we run the risk.
- [ -n "${MAIL_TO:-}" ] && MAILADDR="$MAIL_TO"
-
[ -n "$AUTOSTART" ] && db_set mdadm/autostart "$AUTOSTART"
[ -n "$AUTOCHECK" ] && db_set mdadm/autocheck "$AUTOCHECK"
[ -n "$START_DAEMON" ] && db_set mdadm/start_daemon "$START_DAEMON"
diff --git a/debian/mdadm.postinst b/debian/mdadm.postinst
index 44a1e850..9f55b2f9 100644
--- a/debian/mdadm.postinst
+++ b/debian/mdadm.postinst
@@ -100,10 +100,6 @@ DAEMON_OPTIONS="$DAEMON_OPTIONS"
# if this variable is set to true, mdadm will be a little more verbose e.g.
# when creating the initramfs.
VERBOSE=${VERBOSE:-false}
-
-# MAIL_TO:
-# this variable is now managed in /etc/mdadm/mdadm.conf (MAILADDR).
-# Please see mdadm.conf(5).
_eof
db_stop