X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F21xdriver;h=105f5b24d32cba70f19ae11610cb08c12f0e8de1;hb=8144f957e4f61ee26c1e56719a78ca4f97073aeb;hp=5232f5ffb009a0cc1f538c3b43a6e54f244b7771;hpb=7b390a2051b1f427275820d098efa027b6994457;p=live-boot-grml.git

diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver
index 5232f5f..105f5b2 100755
--- a/scripts/live-bottom/21xdriver
+++ b/scripts/live-bottom/21xdriver
@@ -20,12 +20,7 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOXAUTOCONFIG}" ]
-then
-	exit 0
-fi
-
-if [ ! -x /root/usr/bin/X ]
+if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -z "${XDRIVER}" ]
 then
 	exit 0
 fi
@@ -36,22 +31,21 @@ log_begin_msg "Configuring X video driver"
 
 # live-initramfs script
 
-if [ -n "$XDRIVER" ]
-then
-	mount -o bind /sys /root/sys
-	mount -o bind /proc /root/proc
-	mount -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