summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2014-10-06 11:30:39 +0400
committerMichael Tokarev <mjt@tls.msk.ru>2014-10-06 11:30:39 +0400
commit225a9210d40c6780b50996d53bff7f836834b99f (patch)
treeef7d69209d6e60ab7aa1e66beb62fb324b276ce3 /debian
parent8bcb9e6f769e950a8ab4be343499d33af1eec7d0 (diff)
remove /var/lib/mdadm in postinst and config files in purge (#764036)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/mdadm.postinst4
-rw-r--r--debian/mdadm.postrm4
3 files changed, 14 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f1c7da07..9bdd98a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mdadm (3.3.2-3) UNRELEASED; urgency=low
+
+ * remove /var/lib/mdadm dir in postinst to clean up from old pkg,
+ remove config files on purge (restore extraneous cleanup from
+ last change) (Closes: #764036)
+
+ -- Michael Tokarev <mjt@tls.msk.ru> Mon, 06 Oct 2014 11:28:42 +0400
+
mdadm (3.3.2-2) unstable; urgency=medium
* remove more leftovers from old versions
diff --git a/debian/mdadm.postinst b/debian/mdadm.postinst
index 1bbe9fdb..bf0db667 100644
--- a/debian/mdadm.postinst
+++ b/debian/mdadm.postinst
@@ -100,8 +100,8 @@ _eof
command -v update-initramfs >/dev/null 2>&1 && update-initramfs -u
if dpkg --compare-versions "$2" le 3.3.2-1; then
- rm -f /var/lib/mdadm/CONF-UNCHECKED
- rm -f /var/lib/mdadm/mdadm.conf-generated
+ rm -f /var/lib/mdadm/CONF-UNCHECKED /var/lib/mdadm/mdadm.conf-generated
+ rm --ignore-fail-on-non-empty /var/lib/mdadm
fi
;;
esac
diff --git a/debian/mdadm.postrm b/debian/mdadm.postrm
index 11de7c7e..668100a7 100644
--- a/debian/mdadm.postrm
+++ b/debian/mdadm.postrm
@@ -14,6 +14,10 @@ case "${1:-}" in
fi
;;
+ purge)
+ rm -f /etc/default/mdadm /etc/mdadm.conf /etc/mdadm/mdadm.conf
+ ;;
+
esac
[ -d /run/systemd/system ] && systemctl --system daemon-reload >/dev/null || :