r117 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-20 14:21:10 +0000 (Sun, 20 Aug 2006)
New Revision: 117

Modified:
   mdadm/trunk/debian/mdadm.dirs
   mdadm/trunk/debian/mdadm.postinst
   mdadm/trunk/debian/mdadm.postrm
Log:
added unchecked sentinel

Modified: mdadm/trunk/debian/mdadm.dirs
===================================================================
--- mdadm/trunk/debian/mdadm.dirs	2006-08-20 13:20:43 UTC (rev 116)
+++ mdadm/trunk/debian/mdadm.dirs	2006-08-20 14:21:10 UTC (rev 117)
@@ -5,4 +5,5 @@
 usr/share/initramfs-tools/scripts/local-top
 usr/share/bug/mdadm
 usr/share/lintian/overrides
+var/lib/mdadm
 lib/udev

Modified: mdadm/trunk/debian/mdadm.postinst
===================================================================
--- mdadm/trunk/debian/mdadm.postinst	2006-08-20 13:20:43 UTC (rev 116)
+++ mdadm/trunk/debian/mdadm.postinst	2006-08-20 14:21:10 UTC (rev 117)
@@ -47,13 +47,17 @@
   if [ ! -f $CONFIG ] && [ ! -f $ALTCONFIG ]; then
     echo -n 'Generating mdadm.conf... ' >&2
     if /usr/share/mdadm/mkconf >$CONFIG 2>/dev/null; then
-      mkdir -p /var/lib/mdadm
       md5sum $CONFIG > /var/lib/mdadm/mdadm.conf-generated
       echo done. >&2
     else
       echo "failed (/proc probably not mounted)." >&2
       rm -f $CONFIG
     fi
+  elif dpkg --compare-versions "${2:-2.5.3-1}" le 2.5.3-1
+    # we're upgrading from before 2.5.3-1 and there's apparently already
+    # a connfiguration file which we cannot verify. We'll use the sentinel
+    # during initramfs creation.
+    touch /var/lib/mdadm/CONF-UNCHECKED
   fi
 
   [ ! -f $CONFIG ] && CONFIG=$ALTCONFIG

Modified: mdadm/trunk/debian/mdadm.postrm
===================================================================
--- mdadm/trunk/debian/mdadm.postrm	2006-08-20 13:20:43 UTC (rev 116)
+++ mdadm/trunk/debian/mdadm.postrm	2006-08-20 14:21:10 UTC (rev 117)
@@ -22,7 +22,7 @@
     if [ -f /var/lib/mdadm/mdadm.conf-generated ]; then
       rm -f /etc/mdadm/mdadm.conf
     fi
-    rm -rf /var/lib/mdadm
+    rm -rf /var/lib/mdadm/CONF-UNCHECKED
     ;;
 
   *) :;;