summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--debian/mdadm.postinst6
2 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 79c5f9ad..f0dda2a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mdadm (3.3.2-4) UNRELEASED; urgency=medium
+
+ * really remove /var/lib/mdadm in postinst, fixing a brown-paper bag
+ bug in previous upload (I fixed it earlier but forgot to commit it
+ before 3.3.2-3 release). (Closes: #764036 #771852)
+
+ -- Michael Tokarev <mjt@tls.msk.ru> Fri, 05 Dec 2014 11:10:02 +0300
+
mdadm (3.3.2-3) unstable; urgency=medium
* remove /var/lib/mdadm dir in postinst to clean up from old pkg,
diff --git a/debian/mdadm.postinst b/debian/mdadm.postinst
index bda3b27d..a603376d 100644
--- a/debian/mdadm.postinst
+++ b/debian/mdadm.postinst
@@ -98,9 +98,11 @@ _eof
command -v update-initramfs >/dev/null 2>&1 && update-initramfs -u
- if dpkg --compare-versions "$2" le 3.3.2-1; then
+ if dpkg --compare-versions "$2" le 3.3.2-3; then
rm -f /var/lib/mdadm/CONF-UNCHECKED /var/lib/mdadm/mdadm.conf-generated
- rm --ignore-fail-on-non-empty /var/lib/mdadm
+ if [ -d /var/lib/mdadm ]; then
+ rmdir --ignore-fail-on-non-empty /var/lib/mdadm
+ fi
fi
;;
esac