[Pkg-sysvinit-commits] r1673 - sysvinit/trunk/debian/sysv-rc/sbin

[Kel Modderman]

Author: kelmo-guest
Date: 2009-08-31 15:52:15 +0000 (Mon, 31 Aug 2009)
New Revision: 1673

Modified:
   sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
Log:
Do not consider insserv overrides when comparing update-rc.d arguments against LSB defaults of script LSB header. Promote override message to a warning.

Modified: sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
===================================================================
--- sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d	2009-08-31 15:20:35 UTC (rev 1672)
+++ sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d	2009-08-31 15:52:15 UTC (rev 1673)
@@ -463,9 +463,8 @@
     my ($name, $act) = (shift, shift);
     my ($lsb_start_ref, $lsb_stop_ref, $arg_str, $lsb_str, $differ);
     my (@arg_start_lvls, @arg_stop_lvls, @lsb_start_lvls, @lsb_stop_lvls);
-    my $lsb_header = lsb_header_for_script($name);
 
-    ($lsb_start_ref, $lsb_stop_ref) = parse_def_start_stop($lsb_header);
+    ($lsb_start_ref, $lsb_stop_ref) = parse_def_start_stop("/etc/init.d/$name");
     @lsb_start_lvls = @$lsb_start_ref;
     @lsb_stop_lvls  = @$lsb_stop_ref;
     return if (!@lsb_start_lvls and !@lsb_stop_lvls);
@@ -515,7 +514,7 @@
                 "LSB Default-Stop values ($lsb_str)";
     }
 
-    info "arguments \`$act @_' overridden by LSB info of $lsb_header" if $differ;
+    warning "arguments \`$act @_' overridden by $name LSB info" if $differ;
 }
 
 sub insserv_toggle {