[Pkg-sysvinit-commits] r1224 - in sysvinit/trunk/debian: . initscripts

[pere at alioth.debian.org]

Author: pere
Date: 2008-01-20 09:29:51 +0000 (Sun, 20 Jan 2008)
New Revision: 1224

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/preinst
Log:
  * Rewrite conffile removal code in initscripts.preinst to use the
    original *.dpkg-old and not the *.dpkg-bak introduced when copying
    code from <URL: http://wiki.debian.org/DpkgConffileHandling >.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-01-18 11:13:15 UTC (rev 1223)
+++ sysvinit/trunk/debian/changelog	2008-01-20 09:29:51 UTC (rev 1224)
@@ -1,3 +1,11 @@
+sysvinit (2.86.ds1-52) UNRELEASED; urgency=low
+
+  * Rewrite conffile removal code in initscripts.preinst to use the
+    original *.dpkg-old and not the *.dpkg-bak introduced when copying
+    code from <URL: http://wiki.debian.org/DpkgConffileHandling >.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sun, 20 Jan 2008 10:28:07 +0100
+
 sysvinit (2.86.ds1-51) unstable; urgency=low
 
   * Remove debug code left by mistake in if-up.d/mountnfs when fixing

Modified: sysvinit/trunk/debian/initscripts/preinst
===================================================================
--- sysvinit/trunk/debian/initscripts/preinst	2008-01-18 11:13:15 UTC (rev 1223)
+++ sysvinit/trunk/debian/initscripts/preinst	2008-01-20 09:29:51 UTC (rev 1224)
@@ -20,7 +20,7 @@
 		if [ "$CURRENT_MD5SUM" != "$FACTORY_MD5SUM" ]; then
 			echo "Obsolete conffile $CONFFILE has been modified by you."
 			echo "Saving as $CONFFILE.dpkg-bak ..."
-			mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+			mv -f "$CONFFILE" "$CONFFILE".dpkg-old
 		else
 			echo "Removing obsolete conffile $CONFFILE ..."
 			rm -f "$CONFFILE"