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

Petter Reinholdtsen pere at alioth.debian.org
Wed Jun 9 20:37:43 UTC 2010


Author: pere
Date: 2010-06-09 20:37:42 +0000 (Wed, 09 Jun 2010)
New Revision: 1923

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc.postinst
Log:
Loosen up the migration check to dependency based boot sequencing,
to only report removed but not purged packages if insserv detected
problems with the init.d script dependencies.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-06-09 20:27:58 UTC (rev 1922)
+++ sysvinit/trunk/debian/changelog	2010-06-09 20:37:42 UTC (rev 1923)
@@ -16,6 +16,9 @@
   * Drop support for the now obsolete devfs file system in the init.d
     scripts bootmisc.sh, checkroot.sh, mountdevsubfs.sh, umountfs and
     umountnfs.sh.
+  * Loosen up the migration check to dependency based boot sequencing,
+    to only report removed but not purged packages if insserv detected
+    problems with the init.d script dependencies.
   * Add Norwegian Bokmål (nb) debconf translation.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 05 Jun 2010 00:33:27 +0200

Modified: sysvinit/trunk/debian/sysv-rc.postinst
===================================================================
--- sysvinit/trunk/debian/sysv-rc.postinst	2010-06-09 20:27:58 UTC (rev 1922)
+++ sysvinit/trunk/debian/sysv-rc.postinst	2010-06-09 20:37:42 UTC (rev 1923)
@@ -73,15 +73,6 @@
         fi
     done
 
-    # Refuse to migrate if there are removed but not purged packages
-    # with init.d scripts, as their dependency information is probably
-    # outdated or missing, leading to incorrect ordering.
-    for package in $(dpkg -l $(dpkg -S /etc/init.d/* 2>/dev/null |
-	    cut -d: -f1 |sort -u)|grep ^rc|awk '{print $2}') ; do
-	retval=0
-	add_problematic "package $package removed but not purged"
-    done
-
     # Refuse to migrate if insserv find problems, like loops,
     # duplicate provides, script providing system facility or missing
     # header completely.
@@ -91,6 +82,15 @@
 	msg=$(egrep "$errstr" $logfile | sed 's/$/, /' | tr "\n" " ")
 	retval=0
 	add_problematic "$msg"
+
+	# If insserv found problems, report removed but not purged
+	# packages, as their dependency information is probably
+	# outdated or missing, leading to incorrect ordering.
+	for package in $(dpkg -l $(dpkg -S /etc/init.d/* 2>/dev/null |
+		cut -d: -f1 |sort -u)|grep ^rc|awk '{print $2}') ; do
+	    retval=0
+	    add_problematic "package $package removed but not purged"
+	done
     fi
     rm $logfile
     return $retval




More information about the Pkg-sysvinit-commits mailing list