# live-initramfs 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
-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
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