X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F21xdriver;h=92bbd4f64db3acb03821c2d432d89e55189fc95f;hb=e66f79476042794195978ee641aa7ea0d9ca6e0a;hp=c96f0eaee7fc78767d50e1efd4766f346274c886;hpb=9171ce28fbec2c18a19730044d1ac2157ccb396b;p=live-boot-grml.git

diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver
index c96f0ea..92bbd4f 100755
--- a/scripts/live-bottom/21xdriver
+++ b/scripts/live-bottom/21xdriver
@@ -18,34 +18,39 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
-if [ -n "${NOXAUTOCONFIG}" ]
+if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -z "${XDRIVER}" ]
 then
 	exit 0
 fi
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring X kludges..."
+log_begin_msg "Configuring X video driver"
 
-# live-initramfs script
+# live-boot script
 
-if [ -n "$XDRIVER" ]
+. /live.vars
+
+mount -o bind /sys /root/sys
+mount -o bind /proc /root/proc
+mount -o bind /dev /root/dev
+
+if [ "${XDRIVER}" != "dexconf" ]
 then
-	mount -n -o bind /sys /root/sys
-	mount -n -o bind /proc /root/proc
-	mount -n -o bind /dev /root/dev
 
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
+chroot /root debconf-communicate -fnoninteractive live-boot > /dev/null << EOF
 set xserver-xorg/autodetect_video_card false
 set xserver-xorg/config/device/driver ${XDRIVER}
 EOF
 
-	chroot /root dexconf
-
-	umount /root/sys
-	umount /root/proc
-	umount /root/dev
 fi
 
+chroot /root dexconf
+
+umount /root/sys
+umount /root/proc
+umount /root/dev
+
+log_end_msg