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

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

Author: kelmo-guest
Date: Mon Aug 31 16:22:17 2009
New Revision: 977

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=977
Log:
Sync with sysvinit update-rc.d for fixups to cmp_args_with_defaults, once more.

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=977&op=diff
==============================================================================
--- trunk/src/insserv/debian/update-rc.d-insserv (original)
+++ trunk/src/insserv/debian/update-rc.d-insserv Mon Aug 31 16:22:17 2009
@@ -471,10 +471,6 @@
     @lsb_stop_lvls  = @$lsb_stop_ref;
     return if (!@lsb_start_lvls and !@lsb_stop_lvls);
 
-    if (defined $_[0]) {
-        shift if ($_[0] !~ /^(start|stop|defaults)$/);
-    }
-
     if ($act eq 'defaults') {
         @arg_start_lvls = (2, 3, 4, 5);
         @arg_stop_lvls  = (0, 1, 6);
@@ -482,7 +478,12 @@
         my $start = $act eq 'start' ? 1 : 0;
         my $stop = $act eq 'stop' ? 1 : 0;
 
-        my $argi = 0;
+        # The legacy part of this program passes arguments starting with
+        # "start|stop NN x y z ." but the insserv part gives argument list
+        # starting with sequence number (ie. strips off leading "start|stop")
+        # Start processing arguments immediately after the first seq number.
+        my $argi = $_[0] eq $act ? 2 : 1;
+
         while (defined $_[$argi]) {
             my $arg = $_[$argi];
             if ($arg eq 'start') {
@@ -516,7 +517,7 @@
                 "LSB Default-Stop values ($lsb_str)";
     }
 
-    warning "arguments \`$act @_' overridden by $name LSB info" if $differ;
+    warning "command line arguments overridden by $name LSB info" if $differ;
 }
 
 sub insserv_toggle {