[Pkg-sysvinit-commits] r163 - in sysvinit/trunk/debian: . sysv-rc/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2005-11-19 22:42:29 +0000 (Sat, 19 Nov 2005)
New Revision: 163

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
Make sure to source *.sh scripts for runlevel 'S'.  Will solve
#339955 when no parallelization is enabled.


Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-19 20:12:40 UTC (rev 162)
+++ sysvinit/trunk/debian/changelog	2005-11-19 22:42:29 UTC (rev 163)
@@ -1,7 +1,8 @@
 sysvinit (2.86.ds1-7) UNRELEASED; urgency=low
 
   [ Petter Reinholdtsen ]
-  * Dummy changelog entry, while waiting for real changes.
+  * Make sure to source *.sh scripts for runlevel 'S'.  Will solve
+    #339955 when no parallelization is enabled.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 19 Nov 2005 21:11:34 +0100
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2005-11-19 20:12:40 UTC (rev 162)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2005-11-19 22:42:29 UTC (rev 163)
@@ -37,12 +37,14 @@
     action=$1
     shift
     scripts="$@"
+    sh=sh
+    [ S = "$runlevel" ] && sh=.
     case "$CONCURRENCY" in
 	none)
 	    for script in $scripts ; do
 	        case "$script" in
   	          *.sh)
-		      $debug sh "$script" $action
+		      $debug $sh "$script" $action
 		      ;;
 	          *)
 	              $debug "$script" $action