[Pkg-sysvinit-commits] r908 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-11 08:41:01 +0000 (Mon, 11 Sep 2006)
New Revision: 908

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/rc.local
   sysvinit/trunk/debian/initscripts/etc/init.d/skeleton
Log:
  * Change mountnfs.sh, rc.local and skeleton to use /lib/init/vars.sh
    instead of sourcing /etc/default/rcS, to activate the INIT_VERBOSE
    variable for these scripts.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-11 06:49:06 UTC (rev 907)
+++ sysvinit/trunk/debian/changelog	2006-09-11 08:41:01 UTC (rev 908)
@@ -2,6 +2,9 @@
 
   * Correct status report handling in umountnfs.sh.  Based on patch
     from Markus Schoder. (Closes: #386893)
+  * Change mountnfs.sh, rc.local and skeleton to use /lib/init/vars.sh
+    instead of sourcing /etc/default/rcS, to activate the INIT_VERBOSE
+    variable for these scripts.
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 11 Sep 2006 00:44:44 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2006-09-11 06:49:06 UTC (rev 907)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2006-09-11 08:41:01 UTC (rev 908)
@@ -13,7 +13,7 @@
 #                    for them to be mounted before carrying on.
 ### END INIT INFO
 
-[ -f /etc/default/rcS ] && . /etc/default/rcS
+. /lib/init/vars.sh
 . /lib/lsb/init-functions
 
 do_start() {

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/rc.local
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/rc.local	2006-09-11 06:49:06 UTC (rev 907)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/rc.local	2006-09-11 08:41:01 UTC (rev 908)
@@ -10,7 +10,8 @@
 
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
-[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+. /lib/init/vars.sh
 . /lib/lsb/init-functions
 
 do_start() {

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/skeleton
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/skeleton	2006-09-11 06:49:06 UTC (rev 907)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/skeleton	2006-09-11 08:41:01 UTC (rev 908)
@@ -33,7 +33,7 @@
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
 # Load the VERBOSE setting and other rcS variables
-[ -f /etc/default/rcS ] && . /etc/default/rcS
+. /lib/init/vars.sh
 
 # Define LSB log_* functions.
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.