X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F21xdriver;h=92bbd4f64db3acb03821c2d432d89e55189fc95f;hb=refs%2Ftags%2Fupstream%2F2.0_a5;hp=105f5b24d32cba70f19ae11610cb08c12f0e8de1;hpb=08244e9b0c9b4be3c841fcc7d54f9b940ab4ec1c;p=live-boot-grml.git diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver index 105f5b2..92bbd4f 100755 --- a/scripts/live-bottom/21xdriver +++ b/scripts/live-bottom/21xdriver @@ -18,7 +18,7 @@ case "${1}" in ;; esac -# live-initramfs header +# live-boot header if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -z "${XDRIVER}" ] then @@ -29,7 +29,7 @@ fi log_begin_msg "Configuring X video driver" -# live-initramfs script +# live-boot script . /live.vars @@ -37,11 +37,16 @@ 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 +if [ "${XDRIVER}" != "dexconf" ] +then + +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 +fi + chroot /root dexconf umount /root/sys