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

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-05 09:45:01 +0000 (Sat, 05 Sep 2009)
New Revision: 1719

Modified:
   sysvinit/trunk/debian/sysv-rc.postrm
   sysvinit/trunk/debian/sysv-rc.prerm
Log:
Explain more why removal operations is done where, and fix small typo in exit value from prerm.  Remove recorded update-rc.d arguments when they have been used.

Modified: sysvinit/trunk/debian/sysv-rc.postrm
===================================================================
--- sysvinit/trunk/debian/sysv-rc.postrm	2009-09-05 09:31:27 UTC (rev 1718)
+++ sysvinit/trunk/debian/sysv-rc.postrm	2009-09-05 09:45:01 UTC (rev 1719)
@@ -19,6 +19,9 @@
 
 umask 022
 
+# If an alternative update-rc.d and invoke-rc.d implementation is
+# unpacked before this postrm script is executed, we do not want to
+# replace their programs with the symlink.
 if [ ! -e /usr/sbin/update-rc.d ] ; then
     ln -sf /usr/share/sysvinit/update-rc.d /usr/sbin/update-rc.d
 fi
@@ -31,9 +34,6 @@
 rm -f /etc/init.d/.depend.start
 rm -f /etc/init.d/.depend.stop
 
-# Remove the recorded update-rc.d calls
-rm -f /var/lib/update-rc.d/*
-
 # 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-05 09:31:27 UTC (rev 1718)
+++ sysvinit/trunk/debian/sysv-rc.prerm	2009-09-05 09:45:01 UTC (rev 1719)
@@ -75,6 +75,10 @@
 	rm /etc/rc?.d/[KS][0-9][0-9]$script
 	sh /var/lib/update-rc.d/$script > /dev/null
     done
+
+    # Remove the recorded update-rc.d calls we just processed
+    rm -f /var/lib/update-rc.d/*
+
     return 0
 }
  
@@ -84,6 +88,7 @@
             # update-rc.d calls are recorded already.
 	    if [ ! -f /etc/init.d/.legacy-bootordering ] ; then
 		revert_to_legacy_ordering
+		exit $?
 	    fi
 	    ;;
 	*) : ;;