diff -Nru live-config-3.0~a22/debian/changelog live-config-3.0~a22/debian/changelog
--- live-config-3.0~a22/debian/changelog	2011-07-08 15:36:55.000000000 +0000
+++ live-config-3.0~a22/debian/changelog	2011-07-08 20:38:20.000000000 +0000
@@ -1,3 +1,12 @@
+live-config (3.0~a22-1~natty2) natty; urgency=low
+
+  * start upstart-job on filesystem event
+  * edit /etc/lxdm/default.conf for lubuntu
+  * restart lxdm after configuring it
+  * don't fail on locale generation if /etc/locale.gen doesn't exist
+  
+ -- Reinhard Tartler <siretart@tauware.de>  Fri, 08 Jul 2011 20:24:35 +0200
+
 live-config (3.0~a22-1~natty1) natty; urgency=low
 
   * backport to natty
diff -Nru live-config-3.0~a22/debian/live-config-upstart.live-config.upstart live-config-3.0~a22/debian/live-config-upstart.live-config.upstart
--- live-config-3.0~a22/debian/live-config-upstart.live-config.upstart	2011-06-13 07:18:22.000000000 +0000
+++ live-config-3.0~a22/debian/live-config-upstart.live-config.upstart	2011-07-08 20:26:45.000000000 +0000
@@ -9,8 +9,10 @@
 description	"live-config"
 author		"Debian Live Project <debian-live@lists.debian.org>"
 
-start on runlevel S
-stop on runlevel [!2345]
+start on local-filesystems
+stop on runlevel [016]
+
+console output
 
 script
 	if [ -e /lib/live/config.sh ]
diff -Nru live-config-3.0~a22/debian/patches/locales.patch live-config-3.0~a22/debian/patches/locales.patch
--- live-config-3.0~a22/debian/patches/locales.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-config-3.0~a22/debian/patches/locales.patch	2011-07-08 20:41:53.000000000 +0000
@@ -0,0 +1,16 @@
+From: Reinhard Tartler <siretart@tauware.de>
+Subject: Don't fail locale generation on ubuntu
+
+--- live-config-3.0~a22.orig/scripts/config/004-locales
++++ live-config-3.0~a22/scripts/config/004-locales
+@@ -99,7 +99,9 @@ Configure_locales ()
+ 	fi
+ 
+ 	printf 'LANG="%s"\n' "${LANG}" > /etc/default/locale
+-	sed -i -e "s|# ${LANG} ${_CODEPAGE}|${LANG} ${_CODEPAGE}|" /etc/locale.gen
++	if [ -f /etc/locale.gen ]; then
++		sed -i -e "s|# ${LANG} ${_CODEPAGE}|${LANG} ${_CODEPAGE}|" /etc/locale.gen
++	fi
+ 
+ 	locale-gen --keep-existing > /dev/null 2>&1
+ 
diff -Nru live-config-3.0~a22/debian/patches/restart-lxdm.patch live-config-3.0~a22/debian/patches/restart-lxdm.patch
--- live-config-3.0~a22/debian/patches/restart-lxdm.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-config-3.0~a22/debian/patches/restart-lxdm.patch	2011-07-08 20:45:51.000000000 +0000
@@ -0,0 +1,36 @@
+From: Reinhard Tartler <siretart@tauware.de>
+Subject: Restart lxdm after configuring it
+
+
+--- live-config-3.0~a22.orig/scripts/config/009-lxdm
++++ live-config-3.0~a22/scripts/config/009-lxdm
+@@ -34,15 +34,27 @@ Configure_lxdm ()
+ {
+ 	if [ -e /etc/lxdm/lxdm.conf ]
+ 	then
+-		sed -i -r -e "s|^#?autologin=.*\$|autologin=${LIVE_USERNAME}|" \
+-			  -e "s|^#?session.*\$|session|" \
++		sed -i -r -e "s|^#.*autologin=.*\$|autologin=${LIVE_USERNAME}|" \
++			  -e "s|^#.*session.*\$|session=/usr/bin/startlubuntu|" \
+ 		/etc/lxdm/lxdm.conf
+ 	fi
+ 
++	if [ -e /etc/lxdm/default.conf ]
++	then
++		sed -i -r -e "s|^#.*autologin=.*\$|autologin=${LIVE_USERNAME}|" \
++			  -e "s|^#.*session.*\$|session=/usr/bin/startlubuntu|" \
++		/etc/lxdm/default.conf
++	fi
++
+ 	# Avoid xinit
+ 	_X11="true"
+ 	export _X11
+ 
++        # start lxdm if already started
++        if stop lxdm; then
++            start lxdm
++        fi
++
+ 	# Creating state file
+ 	touch /var/lib/live/config/lxdm
+ }
diff -Nru live-config-3.0~a22/debian/patches/series live-config-3.0~a22/debian/patches/series
--- live-config-3.0~a22/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ live-config-3.0~a22/debian/patches/series	2011-07-08 20:43:42.000000000 +0000
@@ -0,0 +1,3 @@
+locales.patch
+restart-lxdm.patch
+upstart.patch
diff -Nru live-config-3.0~a22/debian/patches/upstart.patch live-config-3.0~a22/debian/patches/upstart.patch
--- live-config-3.0~a22/debian/patches/upstart.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-config-3.0~a22/debian/patches/upstart.patch	2011-07-08 20:43:28.000000000 +0000
@@ -0,0 +1,20 @@
+From: Reinhard Tartler <siretart@tauware.de>
+Subject: reload tty jobs gracefully
+
+
+--- live-config-3.0~a22.orig/scripts/config/016-upstart
++++ live-config-3.0~a22/scripts/config/016-upstart
+@@ -44,9 +44,10 @@ Configure_upstart ()
+ 	do
+ 		_TTY="$(basename ${_FILE} .conf)"
+ 
+-		# reloading
+-		stop ${_TTY}
+-		start ${_TTY}
++		# Try reloading
++		if stop ${_TTY}; then
++		    start ${_TTY}
++                fi
+ 	done
+ 
+ 	# Creating state file