r271 - in mdadm/trunk/debian: . initramfs

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-11-11 20:14:36 +0100 (Sat, 11 Nov 2006)
New Revision: 271

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/initramfs/hook
   mdadm/trunk/debian/mdadm.postrm
   mdadm/trunk/debian/startall
Log:
* Actually remove mdadm.conf on purge; previously, the generation of
  a temporary file for initramfs would screw up the purging; thanks to
  Fabrice Lorrain for the report (closes: #398088).

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-11-09 15:24:24 UTC (rev 270)
+++ mdadm/trunk/debian/changelog	2006-11-11 19:14:36 UTC (rev 271)
@@ -1,3 +1,11 @@
+mdadm (2.5.6-4) unstable; urgency=low
+
+  * Actually remove mdadm.conf on purge; previously, the generation of
+    a temporary file for initramfs would screw up the purging; thanks to
+    Fabrice Lorrain for the report (closes: #398088).
+
+ -- martin f. krafft <madduck at debian.org>  Sat, 11 Nov 2006 20:07:55 +0100
+
 mdadm (2.5.6-3) unstable; urgency=low
 
   * Fix a syntax error in mdadm-raid script.

Modified: mdadm/trunk/debian/initramfs/hook
===================================================================
--- mdadm/trunk/debian/initramfs/hook	2006-11-09 15:24:24 UTC (rev 270)
+++ mdadm/trunk/debian/initramfs/hook	2006-11-11 19:14:36 UTC (rev 271)
@@ -150,7 +150,7 @@
 
   if [ $use_temp -eq 1 ]; then
     tmpfile="${DESTMDADMCONF}.tmp"
-    if /usr/share/mdadm/mkconf generate $tmpfile; then
+    if /usr/share/mdadm/mkconf > $tmpfile; then
       # all is well, we now have a temporary configuration file
       info "auto-generated temporary mdadm.conf configuration file." >&2
       install_config $tmpfile $DESTMDADMCONF

Modified: mdadm/trunk/debian/mdadm.postrm
===================================================================
--- mdadm/trunk/debian/mdadm.postrm	2006-11-09 15:24:24 UTC (rev 270)
+++ mdadm/trunk/debian/mdadm.postrm	2006-11-11 19:14:36 UTC (rev 271)
@@ -18,11 +18,11 @@
     ;;
 
   purge)
-    rm -f /etc/default/mdadm
     GEN_SENTINEL=/var/lib/mdadm/mdadm.conf-generated
     if [ -r $GEN_SENTINEL ]; then
       rm -f "$(sed -rne 's,[[:xdigit:]]+  ,,p' $GEN_SENTINEL)"
     fi
+    rm -f /etc/default/mdadm /etc/mdadm.conf /etc/mdadm/mdadm.conf
     rm -rf /var/lib/mdadm
     ;;
 

Modified: mdadm/trunk/debian/startall
===================================================================
--- mdadm/trunk/debian/startall	2006-11-09 15:24:24 UTC (rev 270)
+++ mdadm/trunk/debian/startall	2006-11-11 19:14:36 UTC (rev 271)
@@ -17,7 +17,7 @@
 modprobe -kq md 2>/dev/null || :
 
 if [ ! -f $CONFIG ] && [ ! -f $ALTCONFIG ]; then
-  /usr/share/mdadm/mkconf generate $CONFIG || ret=$?
+  /usr/share/mdadm/mkconf > $CONFIG || ret=$?
   case ${ret:-0} in
     0) :;;
     255) echo W: mdadm: using existing mdadm.conf file... >&2;;