[Initscripts-ng-commits] r882 - in /trunk/src/insserv/debian: changelog update-rc.d-insserv

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

Author: kelmo-guest
Date: Sat May 16 12:07:33 2009
New Revision: 882

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=882
Log:
When arguments to start/stop/defaults action are given to update-
rc.d wrapper, emit a warning that the LSB information of script
overrides the given arguments.

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

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=882&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sat May 16 12:07:33 2009
@@ -28,8 +28,11 @@
     exist.
   * Add debian/bash-completion and install it to /etc/bash_completion.d/
     to enhance usability for bash shell users.
-
- -- Kel Modderman <kel at otaku42.de>  Tue, 14 Apr 2009 00:18:12 +1000
+  * When arguments to start/stop/defaults action are given to update-
+    rc.d wrapper, emit a warning that the LSB information of script
+    overrides the given arguments.
+
+ -- Kel Modderman <kel at otaku42.de>  Sat, 16 May 2009 21:47:19 +1000
 
 insserv (1.12.0-4) unstable; urgency=low
 

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=882&op=diff
==============================================================================
--- trunk/src/insserv/debian/update-rc.d-insserv (original)
+++ trunk/src/insserv/debian/update-rc.d-insserv Sat May 16 12:07:33 2009
@@ -29,7 +29,13 @@
         exec "insserv", @opts;
     }
 } elsif ("defaults" eq $action || "start" eq $action || "stop" eq $action) {
-    # Ignore start/stop/defaults arguments, just add it
+    # All start/stop/defaults arguments are discarded so emit a message if
+    # arguments have been given. When update-rc.d is used in package
+    # maintainer scripts output is almost always redirected to /dev/null
+    # thanks to dh_installinit, so this should not be too noisy.
+    if ($#ARGV >= 0) {
+	info("\`$action @ARGV' overridden by LSB info of $scriptname");
+    }
     exec "insserv", @opts, $scriptname;
 } elsif ("disable" eq $action || "enable" eq $action) {
     toggle($action, $scriptname, @ARGV);
@@ -50,6 +56,10 @@
                 -f: force
 EOF
     exit (1);
+}
+
+sub info {
+    print STDOUT "update-rc.d: @_\n";
 }
 
 sub error {