[Pkg-sysvinit-commits] r1744 - sysvinit/trunk/debian

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-09 18:18:37 +0000 (Wed, 09 Sep 2009)
New Revision: 1744

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc.postrm
   sysvinit/trunk/debian/sysv-rc.prerm
Log:
Remove /etc/init.d/.depend.* in prerm, not postrm, to avoid surprises.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-09-08 05:55:29 UTC (rev 1743)
+++ sysvinit/trunk/debian/changelog	2009-09-09 18:18:37 UTC (rev 1744)
@@ -15,6 +15,7 @@
     use debhelper more, and migrate to debhelper 7.
   * New patch 98_installtarget.patch to improve the sysvinit install
     target.
+  * Remove /etc/init.d/.depend.* in prerm, not postrm, to avoid surprises.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 06 Sep 2009 17:13:33 +0200
 

Modified: sysvinit/trunk/debian/sysv-rc.postrm
===================================================================
--- sysvinit/trunk/debian/sysv-rc.postrm	2009-09-08 05:55:29 UTC (rev 1743)
+++ sysvinit/trunk/debian/sysv-rc.postrm	2009-09-09 18:18:37 UTC (rev 1744)
@@ -29,11 +29,6 @@
     ln -sf /usr/share/sysvinit/update-rc.d /usr/sbin/invoke-rc.d
 fi
 
-# Remove files generated by insserv
-rm -f /etc/init.d/.depend.boot
-rm -f /etc/init.d/.depend.start
-rm -f /etc/init.d/.depend.stop
-
 # Do not remove /etc/init.d/.legacy-bootordering, to allow those
 # taking over to know where to continue.
 

Modified: sysvinit/trunk/debian/sysv-rc.prerm
===================================================================
--- sysvinit/trunk/debian/sysv-rc.prerm	2009-09-08 05:55:29 UTC (rev 1743)
+++ sysvinit/trunk/debian/sysv-rc.prerm	2009-09-09 18:18:37 UTC (rev 1744)
@@ -79,6 +79,11 @@
     # Remove the recorded update-rc.d calls we just processed
     rm -f /var/lib/update-rc.d/*
 
+    # Remove files generated by insserv to disable concurrent booting
+    rm -f /etc/init.d/.depend.boot
+    rm -f /etc/init.d/.depend.start
+    rm -f /etc/init.d/.depend.stop
+
     return 0
 }