[Pkg-sysvinit-commits] r1658 - in sysvinit/trunk/debian: . sysv-rc/sbin

[Petter Reinholdtsen]

Author: pere
Date: 2009-08-27 19:24:25 +0000 (Thu, 27 Aug 2009)
New Revision: 1658

Modified:
   sysvinit/trunk/debian/rules
   sysvinit/trunk/debian/sysv-rc.postinst
   sysvinit/trunk/debian/sysv-rc.postrm
   sysvinit/trunk/debian/sysv-rc.prerm
   sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
Log:
Save update-rc.d actions to /var/lib/update-rc.d/ instead of /var/lib/sysv-rc/lastactions/, as it will be shared with the insserv package.

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-08-27 18:08:17 UTC (rev 1657)
+++ sysvinit/trunk/debian/rules	2009-08-27 19:24:25 UTC (rev 1658)
@@ -287,7 +287,7 @@
 	install -d -o root -g root -m 755 $(tmp)$(doc)/sysv-rc
 	install -d -o root -g root -m 755 $(tmp)/usr/share/sysv-rc
 	install -d -o root -g root -m 755 $(tmp)/var/lib/insserv
-	install -d -o root -g root -m 755 $(tmp)/var/lib/sysv-rc/lastactions
+	install -d -o root -g root -m 755 $(tmp)/var/lib/update-rc.d
 	install -o root -g root -m 644 debian/sysv-rc/doc/* $(tmp)$(doc)/sysv-rc
 	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
 		> $(tmp)$(doc)/sysv-rc/changelog.Debian

Modified: sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
===================================================================
--- sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d	2009-08-27 18:08:17 UTC (rev 1657)
+++ sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d	2009-08-27 19:24:25 UTC (rev 1658)
@@ -50,7 +50,7 @@
 
 sub save_last_action {
     my ($script, @arguments) = @_;
-    my $archive = "/var/lib/sysv-rc/lastactions";
+    my $archive = "/var/lib/update-rc.d";
     open(FILE, ">", "$archive/${script}.new") || die;
     print FILE join(" ","update-rc.d", at arguments), "\n";
     close(FILE);

Modified: sysvinit/trunk/debian/sysv-rc.postinst
===================================================================
--- sysvinit/trunk/debian/sysv-rc.postinst	2009-08-27 18:08:17 UTC (rev 1657)
+++ sysvinit/trunk/debian/sysv-rc.postinst	2009-08-27 19:24:25 UTC (rev 1658)
@@ -98,13 +98,13 @@
 
 activate_insserv() {
     # Save the current sequence numbers in
-    # /var/lib/sysv-rc/lastactions/.  This directory will be updated
+    # /var/lib/update-rc.d/.  This directory will be updated
     # when update-rc.d is called, to make it possible to migrate away
     # from dependency based boot sequencing.  If some script is
-    # missing in /var/lib/sysv-rc/lastactions/, one will have to
+    # missing in /var/lib/update-rc.d/, one will have to
     # reconfigure the package it belong to for update-rc.d to update
-    # the content in /var/lib/sysv-rc/lastactions/.
-    /usr/share/sysv-rc/saveconfig -s /var/lib/sysv-rc/lastactions
+    # the content in /var/lib/update-rc.d/.
+    /usr/share/sysv-rc/saveconfig -s /var/lib/update-rc.d
 
     echo "info: Reordering boot system, log to $logfile"
     (

Modified: sysvinit/trunk/debian/sysv-rc.postrm
===================================================================
--- sysvinit/trunk/debian/sysv-rc.postrm	2009-08-27 18:08:17 UTC (rev 1657)
+++ sysvinit/trunk/debian/sysv-rc.postrm	2009-08-27 19:24:25 UTC (rev 1658)
@@ -32,6 +32,6 @@
 rm -f /etc/init.d/.depend.stop
 
 # Remove the recorded update-rc.d calls
-rm -f /var/lib/sysv-rc/lastactions/*
+rm -f /var/lib/update-rc.d/*
 
 exit 0

Modified: sysvinit/trunk/debian/sysv-rc.prerm
===================================================================
--- sysvinit/trunk/debian/sysv-rc.prerm	2009-08-27 18:08:17 UTC (rev 1657)
+++ sysvinit/trunk/debian/sysv-rc.prerm	2009-08-27 19:24:25 UTC (rev 1658)
@@ -19,7 +19,7 @@
 	enabled=""
 	for f in $(ls /etc/rc?.d/[KS][0-9][0-9]$name 2> /dev/null) ; do
 	    if [ -e $f ] ; then
-		if [ ! -f /var/lib/sysv-rc/lastactions/$name ] ; then
+		if [ ! -f /var/lib/update-rc.d/$name ] ; then
 		    missing="$missing $script"
 		else
 		    present="$present $name"
@@ -72,7 +72,7 @@
     touch /etc/init.d/.legacy-bootordering
     for script in $present ; do
 	rm /etc/rc?.d/[KS][0-9][0-9]$script
-	sh /var/lib/sysv-rc/lastactions/$script > /dev/null
+	sh /var/lib/update-rc.d/$script > /dev/null
     done
     return 0
 }