summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2014-10-04 15:44:41 +0400
committerMichael Tokarev <mjt@tls.msk.ru>2014-10-04 17:07:38 +0400
commit79173a2fa8e4896dce571edb97a381f51d597b56 (patch)
tree8dc6c7f2e2ea903786b2fdd895e34f6052fc45bd /debian
parent0584788a4fa5c4790944b0728a12b675bc23c8eb (diff)
remove more leftovers from old versions
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/mdadm.config14
-rw-r--r--debian/mdadm.preinst8
3 files changed, 6 insertions, 22 deletions
diff --git a/debian/changelog b/debian/changelog
index 3ede7459..9ebcc5ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mdadm (3.3.2-2) UNRELEASED; urgency=medium
+
+ * remove more leftovers from old versions
+
+ -- Michael Tokarev <mjt@tls.msk.ru> Sat, 04 Oct 2014 15:43:57 +0400
+
mdadm (3.3.2-1) unstable; urgency=low
* new minor/bugfix upstream release (Closes: #731884, #763080)
diff --git a/debian/mdadm.config b/debian/mdadm.config
index a7e9b1fb..85745a34 100644
--- a/debian/mdadm.config
+++ b/debian/mdadm.config
@@ -3,13 +3,6 @@
# Copyright © martin f. krafft <madduck@debian.org>
# Distributable under the terms of the GNU GPL version 2.
#
-
-# we need debconf-escape. Without it, defer the configuration.
-if [ ! -x "$(command -v debconf-escape 2>/dev/null)" ]; then
- echo 'I: mdadm: debconf backend too old, defering configuration...' >&2
- exit 0
-fi
-
. /usr/share/debconf/confmodule
# see #369953 for ordering
set -eu
@@ -19,13 +12,6 @@ ALTCONFIG=/etc/mdadm.conf
[ ! -f $CONFIG ] && [ -f $ALTCONFIG ] && CONFIG=$ALTCONFIG
DEBIANCONFIG=/etc/default/mdadm
-DEBIANCONFIG_OLD=/etc/mdadm/debian.conf
-
-if [ ! -e "$DEBIANCONFIG" ]; then
- if [ -e "$DEBIANCONFIG_OLD" ]; then
- DEBIANCONFIG="$DEBIANCONFIG_OLD"
- fi
-fi
db_get mdadm/initrdstart || :
INITRDSTART="$RET"
diff --git a/debian/mdadm.preinst b/debian/mdadm.preinst
index dc6c48ef..b7400183 100644
--- a/debian/mdadm.preinst
+++ b/debian/mdadm.preinst
@@ -35,14 +35,6 @@ case "$1" in
mv $OLDCONFIG $DEBIANCONFIG
fi
- # save the v1 output of -Es just in case we need it for upgrades
- MDADM=/sbin/mdadm
- if [ -x "$MDADM" ] && [ -n "${2:-}" ] && \
- dpkg --compare-versions $2 lt 2; then
- echo DEVICE partitions > /var/backups/mdadm-Es_v1.dump
- $MDADM -Esc /var/backups/mdadm-Es_v1.dump >> /var/backups/mdadm-Es_v1.dump || :
- fi
-
# Used incorrect name s/_/-/, keep all throughout until after jessie is released.
rm_conffile /etc/udev/rules.d/65-mdadm.vol_id.rules
;;