[Initscripts-ng-commits] r130 - in /trunk/src/insserv/debian: changelog update-bootsystem-insserv

[pere at users.alioth.debian.org]

Author: pere
Date: Thu Sep  7 10:52:28 2006
New Revision: 130

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=130
Log:
Change update-bootsystem-insserv to refuse to convert the boot
system if there are dependency loops.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/update-bootsystem-insserv

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=130&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Thu Sep  7 10:52:28 2006
@@ -1,3 +1,10 @@
+insserv (1.08.0-4) unstable; urgency=low
+
+  * Change update-bootsystem-insserv to refuse to convert the boot
+    system if there are dependency loops.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu,  7 Sep 2006 12:47:39 +0200
+
 insserv (1.08.0-3) unstable; urgency=low
 
   * Extend check-initd-order to accept a new argument -o, to not load

Modified: trunk/src/insserv/debian/update-bootsystem-insserv
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/update-bootsystem-insserv?rev=130&op=diff
==============================================================================
--- trunk/src/insserv/debian/update-bootsystem-insserv (original)
+++ trunk/src/insserv/debian/update-bootsystem-insserv Thu Sep  7 10:52:28 2006
@@ -11,6 +11,9 @@
 logdir=/var/log
 backupfile="$logdir/insserv-bootscripts-$now.tar.gz"
 logfile="$logdir/insserv-run-$now.log"
+
+# Make sure insserv is in path
+PATH=/sbin:$PATH
 
 convert_rc_s_to_k() {
   runlevel=$1 # Use level N to disable on all levels
@@ -34,6 +37,16 @@
 	exit 1
     fi
 else
+    insserv -nv > $logfile 2>&1
+    if grep -q 'There is a loop between' $logfile ; then
+	echo "error: Problems running insserv:"
+	grep 'There is a loop between' $logfile | sed 's/^/  /'
+	echo "info: Please check out this manually."
+	echo "info: Refusing to convert boot sequence until this is fixed"
+	rm $logfile
+	exit 1
+    fi
+
     echo "info: Backing up existing boot scripts in $backupfile"
     (cd /etc; tar zcf $backupfile init.d rc*.d)
 
@@ -46,12 +59,5 @@
 	insserv -v
     ) > $logfile 2>&1
 
-    if grep -q 'There is a loop between' $logfile ; then
-	echo "error: Problems running insserv:"
-	grep 'There is a loop between' $logfile | sed 's/^/  /'
-	echo "info: Please check out this manually."
-	
-    fi
-
     echo "info: Use '$0 restore' to restore the old boot sequence."
 fi