X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F21xdriver;h=ef17bfff68345b02aff699c9edec5ff4acba924c;hb=3f5e69a027b894940d48b296ac9379a62f2fa587;hp=34f619f52d6075e77fca284b10831f65fbf0994f;hpb=5f0f3b0c36d433a462176f970d371c77c3020749;p=live-boot-grml.git

diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver
index 34f619f..ef17bff 100755
--- a/scripts/live-bottom/21xdriver
+++ b/scripts/live-bottom/21xdriver
@@ -20,32 +20,32 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOXAUTOCONFIG}" ]
+if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -n "${XDRIVER}" ]
 then
 	exit 0
 fi
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring X kludges"
+log_begin_msg "Configuring X video driver"
 
 # live-initramfs script
 
-if [ -n "$XDRIVER" ]
-then
-	mount -n -o bind /sys /root/sys
-	mount -n -o bind /proc /root/proc
-	mount -n -o bind /dev /root/dev
+. /live.vars
+
+mount -o bind /sys /root/sys
+mount -o bind /proc /root/proc
+mount -o bind /dev /root/dev
 
 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
 
-	chroot /root dexconf
+chroot /root dexconf
 
-	umount /root/sys
-	umount /root/proc
-	umount /root/dev
-fi
+umount /root/sys
+umount /root/proc
+umount /root/dev
 
+log_end_msg