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

[Petter Reinholdtsen]

Author: pere
Date: 2010-05-15 18:27:32 +0000 (Sat, 15 May 2010)
New Revision: 1901

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc
Log:
Make sure now obsolete startpar and shell concurrency setting
work as aliases for makefile style concurrency (Closes: #581704).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-05-14 19:42:47 UTC (rev 1900)
+++ sysvinit/trunk/debian/changelog	2010-05-15 18:27:32 UTC (rev 1901)
@@ -1,3 +1,11 @@
+sysvinit (2.88dsf-5) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Make sure now obsolete startpar and shell concurrency setting
+    work as aliases for makefile style concurrency (Closes: #581704).
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sat, 15 May 2010 20:24:02 +0200
+
 sysvinit (2.88dsf-4) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc	2010-05-14 19:42:47 UTC (rev 1900)
+++ sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc	2010-05-15 18:27:32 UTC (rev 1901)
@@ -117,6 +117,7 @@
 #
 case "$CONCURRENCY" in
 	makefile|startpar|shell) # startpar and shell are obsolete
+		CONCURRENCY=makefile
 		log_action_msg "Using makefile-style concurrent boot in runlevel $runlevel"
 		# The splash API is not handled with this CONCURRENCY mode.
 		# It need to be implented in startpar.  Until that is done