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

[Petter Reinholdtsen]

Author: pere
Date: 2010-05-13 18:35:16 +0000 (Thu, 13 May 2010)
New Revision: 1898

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc
Log:
Call splash_stop early during boot when using concurrent booting,
to stop usplash from confusing X.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-05-13 06:01:03 UTC (rev 1897)
+++ sysvinit/trunk/debian/changelog	2010-05-13 18:35:16 UTC (rev 1898)
@@ -3,6 +3,8 @@
   [ Petter Reinholdtsen ]
   * Fix typo in code detecting legacy boot ordering when concurrent
     startup is enabled.
+  * Call splash_stop early during boot when using concurrent booting,
+    to stop usplash from confusing X.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 13 May 2010 07:56:11 +0200
 

Modified: sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc	2010-05-13 06:01:03 UTC (rev 1897)
+++ sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc	2010-05-13 18:35:16 UTC (rev 1898)
@@ -119,8 +119,14 @@
 	makefile|startpar|shell) # startpar and shell are obsolete
 		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.
+		# It need to be implented in startpar.  Until that is done
+		# stop the splash screen before starting services, to avoid
+		# usplash and X to confuse each other during boot.
 		startup() {
+			if [ start = "$1" ] || [ boot = "$1" ]
+			then
+				$debug splash_stop || true
+			fi
 			eval "$(startpar -p 4 -t 20 -T 3 -M $1 -P $previous -R $runlevel)"
 
 			if [ -n "$failed_service" ]