[SCM] live-config branch, debian-next, updated. debian/3.0_a6-1-2-g1229ba4

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 1229ba47b0d5340cb3432d13198da42420cab254
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 15 11:31:27 2010 +0200

    Adding xinit config script.

diff --git a/scripts/config.sh b/scripts/config.sh
index 5d1404d..9e9c030 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -131,7 +131,7 @@ Cmdline ()
 			live-config.noautologin|noautologin)
 				# Disables both console and graphical autologin.
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
-				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,gdm,gdm3,kdm,lxdm,nodm,slim"
+				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,gdm,gdm3,kdm,lxdm,nodm,slim,xinit"
 				;;
 
 			live-config.nottyautologin|nottyautologin)
@@ -144,7 +144,7 @@ Cmdline ()
 				# Disables graphical autologin, no matter what
 				# mechanism
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
-				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},gdm,gdm3,kdm,lxdm,nodm,slim"
+				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},gdm,gdm3,kdm,lxdm,nodm,slim,xinit"
 				;;
 
 			# Special options
diff --git a/scripts/config/006-gdm b/scripts/config/006-gdm
index c5abfdf..19ace78 100755
--- a/scripts/config/006-gdm
+++ b/scripts/config/006-gdm
@@ -38,6 +38,10 @@ TimedLoginDelay=10"
 
 	sed -i -e "s|\[daemon\]|\[daemon\]\n${_GDM_OPTIONS}|" /etc/gdm/gdm.conf
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/gdm
 }
diff --git a/scripts/config/007-gdm3 b/scripts/config/007-gdm3
index 978c113..44dca50 100755
--- a/scripts/config/007-gdm3
+++ b/scripts/config/007-gdm3
@@ -38,6 +38,10 @@ TimedLoginDelay=10"
 
 	sed -i -e "s|\[daemon\]|\[daemon\]\n${_GDM3_OPTIONS}|" /etc/gdm3/daemon.conf
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/gdm3
 }
diff --git a/scripts/config/008-kdm b/scripts/config/008-kdm
index 312ce63..e67aa0b 100755
--- a/scripts/config/008-kdm
+++ b/scripts/config/008-kdm
@@ -42,6 +42,10 @@ Configure_kdm ()
 			/etc/kde4/kdm/kdmrc
 	fi
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/kdm
 }
diff --git a/scripts/config/009-lxdm b/scripts/config/009-lxdm
index 7ed37de..faf3d87 100755
--- a/scripts/config/009-lxdm
+++ b/scripts/config/009-lxdm
@@ -31,6 +31,10 @@ Configure_lxdm ()
 		/etc/lxdm/lxdm.conf
 	fi
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/lxdm
 }
diff --git a/scripts/config/010-nodm b/scripts/config/010-nodm
index ed0bfea..af95b03 100755
--- a/scripts/config/010-nodm
+++ b/scripts/config/010-nodm
@@ -37,6 +37,10 @@ EOF
 	debconf-set-selections < /tmp/debconf.live
 	rm -f /tmp/debconf.live
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/nodm
 }
diff --git a/scripts/config/011-slim b/scripts/config/011-slim
index 7b72edc..b90ceb9 100755
--- a/scripts/config/011-slim
+++ b/scripts/config/011-slim
@@ -35,6 +35,10 @@ Configure_slim ()
 		  -e "s|^#?default_user.*\$|default_user ${LIVE_USERNAME}|" \
 	/etc/slim.conf
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/slim
 }
diff --git a/scripts/config/011-xinit b/scripts/config/011-xinit
new file mode 100755
index 0000000..e920aee
--- /dev/null
+++ b/scripts/config/011-xinit
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+Xinit ()
+{
+	# Checking if package is installed or already configured
+	if [ ! -e /var/lib/dpkg/info/xinit.list ] || \
+	   [ -e /var/lib/live/config/xinit ] || \
+	   [ "${_X11}" = "true" ]
+	then
+		return
+	fi
+
+	echo -n " xinit"
+
+	Configure_xinit
+}
+
+Configure_xinit ()
+{
+	# Checking if if package is already configured differently
+	if [ -e /etc/profile.d/xinit.sh ] || grep -qs "startx" /etc/skel/.bash_profile
+	then
+		return
+	fi
+
+	if [ -e /etc/profile.d ]
+	then
+
+# squeeze
+cat > /etc/profile.d/xinit.sh << EOF
+if [ -z "\${DISPLAY}" ] && [ \$(tty) = /dev/tty1 ]
+then
+	while true
+	do
+		startx
+	done
+fi
+EOF
+
+	else
+
+# lenny
+cat >> /etc/skel/.bash_profile << EOF
+if [ -z "\${DISPLAY}" ] && [ \$(tty) = /dev/tty1 ]
+then
+	while true
+	do
+		startx
+	done
+fi
+EOF
+
+	fi
+
+	# Creating state file
+	touch /var/lib/live/config/xinit
+}
+
+Xinit

-- 
live-config