[Initscripts-ng-commits] r935 - in /trunk/src/insserv/debian: changelog insserv.config

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Sun Jul 26 14:48:33 2009
New Revision: 935

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=935
Log:
Just use `update-bootsystem-insserv check' to check if changing to
dependency based boot is safe in insserv.config debconf script.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/insserv.config

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=935&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Jul 26 14:48:33 2009
@@ -1,12 +1,17 @@
 insserv (1.12.0-10) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
   * Change check-initd-order to return a exit code when there is a problem
     with the boot sequence or dependencies.
   * Change the default to enable dependency based boot sequencing if
     it is safe to do.  This should enable it in the common case,
     while avoiding conversion on problems.
 
- -- Petter Reinholdtsen <pere at debian.org>  Sun, 26 Jul 2009 13:40:00 +0200
+  [ Kel Modderman ]
+  * Just use `update-bootsystem-insserv check' to check if changing to
+    dependency based boot is safe in insserv.config debconf script.
+
+ -- Kel Modderman <kel at otaku42.de>  Mon, 27 Jul 2009 00:48:18 +1000
 
 insserv (1.12.0-9) unstable; urgency=low
 

Modified: trunk/src/insserv/debian/insserv.config
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/insserv.config?rev=935&op=diff
==============================================================================
--- trunk/src/insserv/debian/insserv.config (original)
+++ trunk/src/insserv/debian/insserv.config Sun Jul 26 14:48:33 2009
@@ -19,38 +19,6 @@
 	    false
 	fi
     esac
-}
-
-
-# Function is_unsafe_to_activate is copied from update-bootsystem-insserv
-is_unsafe_to_activate() {
-    # 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."
-    retval=1
-    for package in $(dpkg -S $(find /etc/init.d -type f -perm /+x) \
-                     2>/dev/null | cut -d: -f1 | sort -u); do
-        obsolete_initscripts=$(dpkg-query -W -f='${Conffiles}\n' $package | \
-            grep 'obsolete$' | grep -o '/etc/init.d/[^ ]\+') || :
-        if [ "$obsolete_initscripts" ]; then
-            for initscript in $obsolete_initscripts; do
-                if [ -e "$initscript" ]; then
-                    echo "error: Obsolete conffile $initscript left behind by package $package"
-                    retval=0
-                fi
-            done
-        fi
-    done
-
-    insserv -nv > $logfile 2>&1 || true
-    if egrep -q 'There is a loop between|already provided!|provides system facility' $logfile ; then
-        echo "error: Problems running insserv:"
-        egrep 'There is a loop between|loop involving service|already provided!|provides system facility' $l
-ogfile | sed 's/^/  /'
-        rm $logfile
-        retval=0
-    fi
-    return $retval
 }
 
 if [ "$1" = configure ] && [ -z "$2" ]; then
@@ -91,7 +59,7 @@
     if check_divert status /usr/sbin/update-rc.d \
 	/usr/sbin/update-rc.d-insserv ; then
 	db_set insserv/enable true
-    elif ! is_unsafe_to_activate ; then
+    elif update-bootsystem-insserv check ; then
 	# No problems with the current boot scripts, should be safe to enable
 	db_set insserv/enable true
     else