[SCM] live-config branch, debian-next, updated. debian/3.0_a32-1-3-g3574492

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 35744925d998053e127e70bed2b31fd46dd100f2
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Feb 19 17:17:39 2012 +0100

    Redirecting startx output in xinit script to /dev/null when booting with quiet.

diff --git a/scripts/config/014-xinit b/scripts/config/014-xinit
index dfe101c..9460cab 100755
--- a/scripts/config/014-xinit
+++ b/scripts/config/014-xinit
@@ -43,7 +43,12 @@ if [ -z "\${DISPLAY}" ] && [ \$(tty) = /dev/tty1 ]
 then
 	while true
 	do
-		startx
+		if grep -qs quiet /proc/cmdline
+		then
+			startx > /dev/null 2>&1
+		else
+			startx
+		fi
 	done
 fi
 EOF

-- 
live-config