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

[Petter Reinholdtsen]

Author: pere
Date: 2005-11-21 08:15:24 +0000 (Mon, 21 Nov 2005)
New Revision: 170

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
Source .sh scripts when running in parallel too.  Closes bug #339955.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-21 08:13:26 UTC (rev 169)
+++ sysvinit/trunk/debian/changelog	2005-11-21 08:15:24 UTC (rev 170)
@@ -1,8 +1,8 @@
 sysvinit (2.86.ds1-7) UNRELEASED; urgency=low
 
   [ Petter Reinholdtsen ]
-  * Make sure to source *.sh scripts for runlevel 'S'.  Will solve
-    #339955 when no parallelization is enabled.
+  * Make sure to source *.sh scripts for runlevel 'S'.  (Closes: #339955)
+
   [ Thomas Hood ]
   * checkroot.sh: Fix double printing of 'Done checking root file system';
     mountall.sh: Fix-chopped up printing of mount information

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2005-11-21 08:13:26 UTC (rev 169)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2005-11-21 08:15:24 UTC (rev 170)
@@ -58,10 +58,19 @@
 	    $debug startpar -a $action $scripts
 	    ;;
 	shell)
+	    backgrounded=0
 	    for script in $scripts ; do
-		$debug $script $action &
+	        case "$script" in
+  	          *.sh)
+		      $debug $sh "$script" $action
+		      ;;
+	          *)
+	              $debug "$script" $action &
+		      backgrounded=1
+		      ;;
+	        esac
 	    done
-	    wait
+	    [ 1 = "$backgrounded" ] && wait
 	    ;;
     esac
 }