Merging casper 1.145.

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

diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver
index c96f0ea..5232f5f 100755 (executable)
--- a/scripts/live-bottom/21xdriver
+++ b/scripts/live-bottom/21xdriver
@@ -25,17 +25,22 @@ then
        exit 0
 fi
 
+if [ ! -x /root/usr/bin/X ]
+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
+       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
@@ -49,3 +54,4 @@ EOF
        umount /root/dev
 fi
 
+log_end_msg