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

[pere at users.alioth.debian.org]

Author: pere
Date: Tue Jan  1 20:05:03 2008
New Revision: 397

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=397
Log:
  * Changed enabling code to refuse to convert to dependency based
    boot sequence if several scripts provide the same service.

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=397&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Tue Jan  1 20:05:03 2008
@@ -18,6 +18,8 @@
   * Changed enabling code to refuse to convert to dependency based
     boot sequence when obsolete init.d scripts are found, as these
     tend to mess up the boot sequence.
+  * Changed enabling code to refuse to convert to dependency based
+    boot sequence if several scripts provide the same service.
   * Added prerm code to refuse to be removed while enabled, to avoid
     messing up the boot system completely.
 

Modified: trunk/src/insserv/debian/update-bootsystem-insserv
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/update-bootsystem-insserv?rev=397&op=diff
==============================================================================
--- trunk/src/insserv/debian/update-bootsystem-insserv (original)
+++ trunk/src/insserv/debian/update-bootsystem-insserv Tue Jan  1 20:05:03 2008
@@ -100,6 +100,7 @@
 else
     # Refuse to convert when there are obsolete init.d scripts left
     # behind, as these tend to confuse the boot sequence.
+    echo "info: checking if it is safe to convert to dependency based boot."
     for package in $(dpkg -S $(find /etc/init.d -type f -perm /+x) \
                      2>/dev/null | cut -d: -f1 | sort -u); do
         if dpkg-query -W -f='${Conffiles}' $package | \
@@ -112,9 +113,9 @@
     done
 
     insserv -nv > $logfile 2>&1
-    if grep -q 'There is a loop between' $logfile ; then
+    if egrep -q 'There is a loop between|already provided!' $logfile ; then
 	echo "error: Problems running insserv:"
-	grep 'There is a loop between' $logfile | sed 's/^/  /'
+	egrep 'There is a loop between|already provided!' $logfile | sed 's/^/  /'
 	echo "info: Please check out this manually."
 	echo "info: Refusing to convert boot sequence until this is fixed"
 	rm $logfile