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

[Petter Reinholdtsen]

Author: pere
Date: 2006-08-02 06:38:02 +0000 (Wed, 02 Aug 2006)
New Revision: 815

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
  * Change handling of CONCURRENCY in init.d/rc, to make sure an
    unrecognized value is treated as 'none'. (Closes: #380602)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-08-01 18:26:20 UTC (rev 814)
+++ sysvinit/trunk/debian/changelog	2006-08-02 06:38:02 UTC (rev 815)
@@ -7,6 +7,8 @@
     code in Ubuntu.  It need to behave the same way as the usplash
     startup code, and should not match the code deciding if
     usplash_write should be used.
+  * Change handling of CONCURRENCY in init.d/rc, to make sure an
+    unrecognized value is treated as 'none'. (Closes: #380602)
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 26 Jul 2006 11:37:23 +0200
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2006-08-01 18:26:20 UTC (rev 814)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2006-08-02 06:38:02 UTC (rev 815)
@@ -93,35 +93,6 @@
 # Start script or program.
 #
 case "$CONCURRENCY" in
-  none)
-	startup() {
-		action=$1
-		shift
-		scripts="$@"
-		sh=sh
-		# Debian Policy §9.3.1 requires .sh scripts in runlevel S to be sourced
-		# However, some important packages currently contain .sh scripts
-		# that do "exit" at some point, thus killing this process.  Bad!
-		#[ S = "$runlevel" ] && sh=.
-		for script in $scripts ; do
-			case "$script" in
-			  *.sh)
-				if [ "." = "$sh" ] ; then
-					set "$action"
-					RC_SAVE_PATH="$PATH"
-					startup_progress $debug . "$script"
-					PATH="$RC_SAVE_PATH"
-				else
-					startup_progress $debug $sh "$script" $action
-				fi
-				;;
-			  *)
-				startup_progress $debug "$script" $action
-				;;
-			esac
-		done
-	}
-	;;
   shell)
 	startup() {
 		action=$1
@@ -190,6 +161,35 @@
 		[ -n "$scripts" ] && startup_progress $debug startpar -a $action $scripts
 	}
 	;;
+  none|*)
+	startup() {
+		action=$1
+		shift
+		scripts="$@"
+		sh=sh
+		# Debian Policy §9.3.1 requires .sh scripts in runlevel S to be sourced
+		# However, some important packages currently contain .sh scripts
+		# that do "exit" at some point, thus killing this process.  Bad!
+		#[ S = "$runlevel" ] && sh=.
+		for script in $scripts ; do
+			case "$script" in
+			  *.sh)
+				if [ "." = "$sh" ] ; then
+					set "$action"
+					RC_SAVE_PATH="$PATH"
+					startup_progress $debug . "$script"
+					PATH="$RC_SAVE_PATH"
+				else
+					startup_progress $debug $sh "$script" $action
+				fi
+				;;
+			  *)
+				startup_progress $debug "$script" $action
+				;;
+			esac
+		done
+	}
+	;;
 esac
 
 # Is there an rc directory for this new runlevel?