Merging casper 1.199.

[live-boot-grml.git] / scripts / live-bottom / 21xdriver

diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver
index ef17bff..e86c310 100755 (executable)
--- a/scripts/live-bottom/21xdriver
+++ b/scripts/live-bottom/21xdriver
@@ -20,7 +20,7 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -n "${XDRIVER}" ]
+if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -z "${XDRIVER}" ]
 then
        exit 0
 fi
@@ -37,11 +37,16 @@ mount -o bind /sys /root/sys
 mount -o bind /proc /root/proc
 mount -o bind /dev /root/dev
 
+if [ "${XDRIVER}" != "dexconf" ]
+then
+
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
 set xserver-xorg/autodetect_video_card false
 set xserver-xorg/config/device/driver ${XDRIVER}
 EOF
 
+fi
+
 chroot /root dexconf
 
 umount /root/sys