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

[Marco Amadori]

The following commit has been merged in the debian-next branch:
commit 8aadc0b03f936244f820264fe3d1f71e09b66f73
Author: Marco Amadori <amadorim at vdavda.com>
Date:   Tue Feb 8 18:24:19 2011 +0100

    Enable autologin for upstart backend.
    
    * Supports also "noautologin" like options;
    * mingetty support included.
    
    Signed-off-by: Marco Amadori <amadorim at vdavda.com>

diff --git a/debian/rules b/debian/rules
index a07e9ef..ed3d19c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,10 @@ override_dh_auto_install:
 	mv debian/live-config/lib/live/config/*-sysvinit debian/live-config-sysvinit/lib/live/config
 	mv debian/live-config/lib/live/config/*-sysv-rc debian/live-config-sysvinit/lib/live/config
 
+	# live-config-upstart
+	mkdir -p debian/live-config-upstart/lib/live/config
+	mv debian/live-config/lib/live/config/*-upstart debian/live-config-upstart/lib/live/config
+
 override_dh_installinit:
 	dh_installinit -p live-config-runit --no-restart-on-upgrade --no-start --update-rcd-params='start 00 S .' --name live-config
 	dh_installinit -p live-config-sysvinit --no-restart-on-upgrade --no-start --update-rcd-params='start 00 S .' --name live-config
diff --git a/scripts/config.sh b/scripts/config.sh
index 1e53a61..fdcc24d 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -63,13 +63,13 @@ 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,xinit"
+				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,gdm,gdm3,kdm,lxdm,nodm,slim,upstart,xinit"
 				;;
 
 			live-config.nottyautologin|nottyautologin)
 				# Disables console autologin.
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
-				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit"
+				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,upstart"
 				;;
 
 			live-config.nox11autologin|nox11autologin)
diff --git a/scripts/config/014-upstart b/scripts/config/014-upstart
new file mode 100755
index 0000000..9aeea88
--- /dev/null
+++ b/scripts/config/014-upstart
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2011 Daniel Baumann <daniel at debian.org>
+## Copyright (C) 2011 Marco Amadori <marco.amadori at gmail.com>
+##
+## 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.
+
+
+Upstart ()
+{
+	# Checking if package is installed or already configured
+	if [ ! -e /var/lib/dpkg/info/upstart.list ] || \
+	   [ -e /var/lib/live/config/upstart ]
+	then
+		return
+	fi
+
+	echo -n " upstart"
+
+	Configure_upstart
+}
+
+Configure_upstart ()
+{
+	for ttyfile in /etc/init/tty*
+	do
+		ttynum=$(basename "${ttyfile}" .conf)
+
+		# mingetty has autologin support
+		if grep -qs '^exec.*mingetty' || [ -e /sbin/mingetty ]
+		then
+			sed -i -e 's|^\(exec.*getty\) *\(--autologin *[^ ]* *\)*.*$|exec /sbin/mingetty --autologin '"${LIVE_USERNAME} ${ttynum}|g" "${ttyfile}"
+		else
+			# substitute getty with a direct login
+			sed -i -e 's|^exec.*getty.*$|exec /bin/login -f '"${LIVE_USERNAME} </dev/${ttynum} >/dev/${ttynum} 2>\&1|" "${ttyfile}"
+		fi
+	done
+
+	init q
+
+	for ttyfile in /etc/init/tty*
+	do
+		ttynum=$(basename "${ttyfile}" .conf)
+		echo "reload ${ttynum}"
+		stop $ttynum
+		start $ttynum
+	done
+
+	# Creating state file
+	touch /var/lib/live/config/upstart
+}
+
+Upstart

-- 
live-config