[Pkg-sysvinit-commits] r295 - sysvinit/trunk/debian/sysv-rc/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2005-11-26 14:19:27 +0000 (Sat, 26 Nov 2005)
New Revision: 295

Modified:
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
Make sure startpar sources the .sh scripts.

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2005-11-25 22:47:21 UTC (rev 294)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2005-11-26 14:19:27 UTC (rev 295)
@@ -52,10 +52,6 @@
 			esac
 		done
 		;;
-	  startpar)
-		# startpar is not working as it should yet [pere 2005-09-10]
-		$debug startpar -a $action $scripts
-		;;
 	  shell)
 		backgrounded=0
 		for script in $scripts ; do
@@ -71,6 +67,26 @@
 		done
 		[ 1 = "$backgrounded" ] && wait
 		;;
+	  startpar)
+		# Make sure .sh scripts are sourced in runlevel S
+		if [ "." = "$sh" ] ; then
+			newscripts=
+			for script in $scripts ; do
+				case "$script" in
+				  *.sh)
+					$debug . "$script" $action
+					;;
+				  *)
+					$newscripts="$newscripts $script"
+					;;
+				esac
+			done
+			scripts="$newscripts"
+		fi
+
+		# startpar is not working as it should yet [pere 2005-09-10]
+		$debug startpar -a $action $scripts
+		;;
 	esac
 }