[Initscripts-ng-commits] r885 - 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:47:29 2009
New Revision: 885

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=885
Log:
Also look in /usr/share/insserv/overrides/ when performing
disable/enable function in update-rc.d.

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=885&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sat May 16 12:47:29 2009
@@ -36,8 +36,10 @@
     instead of a harcoded index.
   * Improve update-rc.d enable/disable function for when an unhandled
     runlevel is given as argument.
-
- -- Kel Modderman <kel at otaku42.de>  Sat, 16 May 2009 22:40:15 +1000
+  * Also look in /usr/share/insserv/overrides/ when performing
+    disable/enable function in update-rc.d.
+
+ -- Kel Modderman <kel at otaku42.de>  Sat, 16 May 2009 22:47:07 +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=885&op=diff
==============================================================================
--- trunk/src/insserv/debian/update-rc.d-insserv (original)
+++ trunk/src/insserv/debian/update-rc.d-insserv Sat May 16 12:47:29 2009
@@ -105,6 +105,10 @@
 	$lsb_header = "/etc/insserv/overrides/$name";
     } elsif (-s "/etc/init.d/$name") {
     	$lsb_header = "/etc/init.d/$name";
+    } elsif (-s "/usr/share/insserv/overrides/$name") {
+	# These overrides take effect only when no LSB info is
+	# in /etc/init.d/$name
+    	$lsb_header = "/usr/share/insserv/overrides/$name";
     } else {
 	error("cannot find an initscript for $name");
     }