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

[Petter Reinholdtsen]

Author: pere
Date: 2009-08-26 19:48:49 +0000 (Wed, 26 Aug 2009)
New Revision: 1643

Modified:
   sysvinit/trunk/debian/sysv-rc.prerm
Log:
Improve messages.

Modified: sysvinit/trunk/debian/sysv-rc.prerm
===================================================================
--- sysvinit/trunk/debian/sysv-rc.prerm	2009-08-26 17:34:34 UTC (rev 1642)
+++ sysvinit/trunk/debian/sysv-rc.prerm	2009-08-26 19:48:49 UTC (rev 1643)
@@ -32,7 +32,7 @@
     if [ "$missing" ] ; then
 	cat <<EOF
 
-Unable to revert to legacy boot ordering to remove sysv-rc.  Missing
+Unable to revert to legacy boot ordering and remove sysv-rc.  Missing
 update-rc.d information for the following packages:
 
 EOF
@@ -40,24 +40,26 @@
 	for pkg in $(dpkg -S $missing | cut -d: -f1 | sort -u) ; do
 	    if dpkg -l $pkg | grep -q ^ii ; then
 		echo "  $pkg"
+		reconf="$reconf $pkg"
 	    else
 		echo "  $pkg (removed but not purged)"
 	    fi
 	done
 	cat <<EOF
 
-This is due to a earlier issues with sysv-rc and insserv.  To work
-around this bug, the packages listed need to be reconfigured to
-register the update-rc.d call again, for example using
+This is due to earlier issues with sysv-rc and insserv.  To work
+around this issue, the packages listed need to register the
+update-rc.d call again, for example using
 
-  dpkg-reconfigure packagename
+  dpkg-reconfigure $reconf
 
-before trying again to migrate to legacy boot ordering.  For some
-packages, purging and reinstalling might be needed to record the
-update-rc.d call.
+before trying again to migrate to legacy boot ordering.  The removed
+packages might need to be purged.  For some packages, purging and
+reinstalling might be needed to record the update-rc.d call.
 
 Aborting package removal until this is done, to avoid leaving the boot
-system in a non-functioning state.
+system in a non-functioning state.  The insserv package need to be
+installed again to 
 
 EOF
 	return 1
@@ -68,7 +70,7 @@
     touch /etc/init.d/.legacy-bootordering
     for script in $present ; do
 	rm /etc/rc?.d/[KS][0-9][0-9]$script
-	sh -x /var/lib/sysv-rc/lastactions/$script
+	sh /var/lib/sysv-rc/lastactions/$script > /dev/null
     done
     return 0
 }