projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding upstream version 2.0~a5.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
21xdriver
diff --git
a/scripts/live-bottom/21xdriver
b/scripts/live-bottom/21xdriver
index
105f5b2
..
92bbd4f
100755
(executable)
--- a/
scripts/live-bottom/21xdriver
+++ b/
scripts/live-bottom/21xdriver
@@
-18,7
+18,7
@@
case "${1}" in
;;
esac
;;
esac
-# live-
initramfs
header
+# live-
boot
header
if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -z "${XDRIVER}" ]
then
if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -z "${XDRIVER}" ]
then
@@
-29,7
+29,7
@@
fi
log_begin_msg "Configuring X video driver"
log_begin_msg "Configuring X video driver"
-# live-
initramfs
script
+# live-
boot
script
. /live.vars
. /live.vars
@@
-37,11
+37,16
@@
mount -o bind /sys /root/sys
mount -o bind /proc /root/proc
mount -o bind /dev /root/dev
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
set xserver-xorg/autodetect_video_card false
set xserver-xorg/config/device/driver ${XDRIVER}
EOF
+fi
+
chroot /root dexconf
umount /root/sys
chroot /root dexconf
umount /root/sys