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 proper code comments about vol_id removal.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
21xdriver
diff --git
a/scripts/live-bottom/21xdriver
b/scripts/live-bottom/21xdriver
index
7a16589
..
e86c310
100755
(executable)
--- a/
scripts/live-bottom/21xdriver
+++ b/
scripts/live-bottom/21xdriver
@@
-20,7
+20,7
@@
esac
# live-initramfs header
# live-initramfs header
-if [ -n "${NOXAUTOCONFIG}" ]
+if [ -n "${NOXAUTOCONFIG}" ]
|| [ ! -x /root/usr/bin/X ] || [ -z "${XDRIVER}" ]
then
exit 0
fi
then
exit 0
fi
@@
-31,22
+31,26
@@
log_begin_msg "Configuring X video driver"
# live-initramfs script
# 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
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 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
fi
+chroot /root dexconf
+
+umount /root/sys
+umount /root/proc
+umount /root/dev
+
log_end_msg
log_end_msg