[Initscripts-ng-commits] r978 - /trunk/src/insserv/debian/update-rc.d-insserv

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

Author: kelmo-guest
Date: Tue Sep  1 12:02:39 2009
New Revision: 978

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=978
Log:
Sync with sysvinit update-rc.d.

Modified:
    trunk/src/insserv/debian/update-rc.d-insserv

Modified: trunk/src/insserv/debian/update-rc.d-insserv
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/update-rc.d-insserv?rev=978&op=diff
==============================================================================
--- trunk/src/insserv/debian/update-rc.d-insserv (original)
+++ trunk/src/insserv/debian/update-rc.d-insserv Tue Sep  1 12:02:39 2009
@@ -463,7 +463,7 @@
 
 sub cmp_args_with_defaults {
     my ($name, $act) = (shift, shift);
-    my ($lsb_start_ref, $lsb_stop_ref, $arg_str, $lsb_str, $differ);
+    my ($lsb_start_ref, $lsb_stop_ref, $arg_str, $lsb_str);
     my (@arg_start_lvls, @arg_stop_lvls, @lsb_start_lvls, @lsb_stop_lvls);
 
     ($lsb_start_ref, $lsb_stop_ref) = parse_def_start_stop("/etc/init.d/$name");
@@ -486,7 +486,11 @@
 
         while (defined $_[$argi]) {
             my $arg = $_[$argi];
-            if ($arg eq 'start') {
+
+            # Runlevels 0 and 6 are always stop runlevels
+            if ($arg eq 0 or $arg eq 6) {
+		$start = 0; $stop = 1; 
+            } elsif ($arg eq 'start') {
                 $start = 1; $stop = 0; $argi++; next;
             } elsif ($arg eq 'stop') {
                 $start = 0; $stop = 1; $argi++; next;
@@ -502,7 +506,6 @@
 
     if ($#arg_start_lvls != $#lsb_start_lvls or
         join("\0", sort @arg_start_lvls) ne join("\0", sort @lsb_start_lvls)) {
-        $differ++;
         $arg_str = @arg_start_lvls ? "@arg_start_lvls" : "none";
         $lsb_str = @lsb_start_lvls ? "@lsb_start_lvls" : "none";
         warning "$name start runlevel arguments ($arg_str) do not match",
@@ -510,14 +513,11 @@
     }
     if ($#arg_stop_lvls != $#lsb_stop_lvls or
         join("\0", sort @arg_stop_lvls) ne join("\0", sort @lsb_stop_lvls)) {
-        $differ++;
         $arg_str = @arg_stop_lvls ? "@arg_stop_lvls" : "none";
         $lsb_str = @lsb_stop_lvls ? "@lsb_stop_lvls" : "none";
         warning "$name stop runlevel arguments ($arg_str) do not match",
                 "LSB Default-Stop values ($lsb_str)";
     }
-
-    warning "command line arguments overridden by $name LSB info" if $differ;
 }
 
 sub insserv_toggle {