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

[pere at users.alioth.debian.org]

Author: pere
Date: Sun Mar 16 19:39:27 2008
New Revision: 728

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=728
Log:
  * Make sure the consistency check in update-bootsystem-insserv
    report all problems and not only the first one.

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=728&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Mar 16 19:39:27 2008
@@ -1,3 +1,10 @@
+insserv (1.11.0-8) UNRELEASED; urgency=low
+
+  * Make sure the consistency check in update-bootsystem-insserv
+    report all problems and not only the first one.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 13 Mar 2008 16:50:53 +0100
+
 insserv (1.11.0-7) unstable; urgency=low
 
   * Added override files for digitools and ddns3-client.

Modified: trunk/src/insserv/debian/update-bootsystem-insserv
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/update-bootsystem-insserv?rev=728&op=diff
==============================================================================
--- trunk/src/insserv/debian/update-bootsystem-insserv (original)
+++ trunk/src/insserv/debian/update-bootsystem-insserv Sun Mar 16 19:39:27 2008
@@ -147,6 +147,7 @@
     # 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 | \
@@ -155,7 +156,7 @@
             for initscript in $obsolete_initscripts; do
                 if [ -e "$initscript" ]; then
                     echo "error: Obsolete conffile $initscript left behind by package $package"
-                    return 0
+                    retval=0
                 fi
             done
         fi
@@ -166,9 +167,9 @@
 	echo "error: Problems running insserv:"
 	egrep 'There is a loop between|loop involving service|already provided!|provides system facility' $logfile | sed 's/^/  /'
 	rm $logfile
-	return 0
-    fi
-    return 1
+	retval=0
+    fi
+    return $retval
 }
 
 activate_insserv() {