[SCM] live-config branch, debian, updated. debian/2.0.15-1-101-g11311cd

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit eb5d94b14dfea726c81eab473e4593636fa74158
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Mar 25 12:36:00 2011 +0100

    Updating xserver-xorg script for setting the driver selection (Closes: #618316).

diff --git a/debian/live-config.postrm b/debian/live-config.postrm
index 8edd391..9c74754 100644
--- a/debian/live-config.postrm
+++ b/debian/live-config.postrm
@@ -6,6 +6,7 @@ case "${1}" in
 	purge)
 		rm -f /etc/sudoers.d/live
 		rm -f /etc/profile.d/zz-live.sh
+		rm -f /etc/X11/xorg.conf.d/99-live_*.conf
 
 		rm -rf /var/lib/live/config
 		rmdir --ignore-fail-on-non-empty /var/lib/live > /dev/null 2>&1 || true
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/116-xserver-xorg
index 683f82a..e07040a 100755
--- a/scripts/config/116-xserver-xorg
+++ b/scripts/config/116-xserver-xorg
@@ -76,8 +76,14 @@ Configure_xserver_xorg ()
 
 	if [ -n "${LIVE_XORG_DRIVER}" ]
 	then
-		echo "xserver-xorg xserver-xorg/autodetect_video_card" >> /tmp/debconf.live
-		echo "xserver-xorg xserver-xorg/config/device/driver ${LIVE_XORG_DRIVER}" >> /tmp/debconf.live
+
+cat > /etc/X11/xorg.conf.d/99-live_driver.conf << EOF
+Section "Device"
+	Identifier	"Default screen"
+	Driver		"${LIVE_XORG_DRIVER}"
+EndSection
+EOF
+
 	fi
 
 	if [ -n "${LIVE_XORG_RESOLUTION}" ]

-- 
live-config