[Initscripts-ng-commits] r180 - in /trunk/src/insserv/debian: changelog check-initd-order

[pere at users.alioth.debian.org]

Author: pere
Date: Fri Sep  8 23:27:05 2006
New Revision: 180

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=180
Log:
New flag -k for check-initd-order to look at the stop sequence instead
of the start sequence.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/check-initd-order

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=180&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Fri Sep  8 23:27:05 2006
@@ -1,3 +1,10 @@
+insserv (1.08.0-5~1) unstable; urgency=low
+
+  * New flag -k for check-initd-order to look at the stop sequence instead
+    of the start sequence.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sat,  9 Sep 2006 01:25:22 +0200
+
 insserv (1.08.0-4) unstable; urgency=low
 
   * Change update-bootsystem-insserv to refuse to convert the boot

Modified: trunk/src/insserv/debian/check-initd-order
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/check-initd-order?rev=180&op=diff
==============================================================================
--- trunk/src/insserv/debian/check-initd-order (original)
+++ trunk/src/insserv/debian/check-initd-order Fri Sep  8 23:27:05 2006
@@ -45,6 +45,7 @@
      'klogd'        => '$syslog',
      'mountall'     => '$local_fs',
      'umountfs'     => '$local_fs',
+     'sendsigs'     => '$local_fs',
      'mountnfs'     => '$remote_fs',
      'umountnfs'    => '$remote_fs',
      'hwclock'      => '$time',
@@ -76,11 +77,12 @@
 	$lsbinfo{'provides'} = $lsbinfo{'file'};
     }
 
+    my $key = $opts{'k'} ? 'stop' : 'start';
     my @provides = split(/\s+/, $lsbinfo{'provides'});
     for my $name (@provides) {
 	if (exists $sysmap{$name}) {
-	    graph_addnode('provides'       => $sysmap{$name},
-			  'required-start' => $name);
+	    graph_addnode('provides'      => $sysmap{$name},
+			  "required-$key" => $name);
 	}
     }
 
@@ -88,7 +90,6 @@
 	print STDERR "warning: Unable to properly handle multiple provides: @provides\n";
     }
 
-    my $key = $opts{'k'} ? 'stop' : 'start';
     if (exists $lsbinfo{"required-$key"} && $lsbinfo{"required-$key"}) {
 	my @depends = split(/\s+/, $lsbinfo{"required-$key"});
 	for my $pkg (@depends) {
@@ -110,7 +111,7 @@
 digraph packages {
 concentrate=true;
 EOF
-    my @dirs = $opts{'k'} ? $rcmap{6} : $rcmap{S}, $rcmap{2};
+    my @dirs = $opts{'k'} ? $rcmap{6} : ($rcmap{S}, $rcmap{2});
     for my $rcdir (@dirs) {
 	chdir "$rcbase/$rcdir/.";
 	my @scripts = $opts{'k'} ? <K*> : <S*>;
@@ -133,7 +134,7 @@
 
 sub check_bootorder {
     my $bootorder = 0;
-    my @dirs = $opts{'k'} ? $rcmap{6} : $rcmap{S}, $rcmap{2};
+    my @dirs = $opts{'k'} ? $rcmap{6} : ($rcmap{S}, $rcmap{2});
     for my $rcdir (@dirs) {
 	chdir "$rcbase/$rcdir/.";
 	my @scripts = $opts{'k'} ? <K*> : <S*>;