projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Be consistent in using 0/1 for True/False values instead of English representations.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
20xconfig
diff --git
a/scripts/live-bottom/20xconfig
b/scripts/live-bottom/20xconfig
index
8886af8
..
947b7ec
100755
(executable)
--- a/
scripts/live-bottom/20xconfig
+++ b/
scripts/live-bottom/20xconfig
@@
-27,8
+27,6
@@
fi
. /scripts/live-functions
. /scripts/live-functions
-log_begin_msg "Configuring X..."
-
# live-initramfs script
if [ "${TERM_TYPE}" = "serial" ]
# live-initramfs script
if [ "${TERM_TYPE}" = "serial" ]
@@
-43,11
+41,18
@@
then
exit 0
fi
exit 0
fi
+if [ ! -x /root/usr/bin/X ]
+then
+ exit 0
+fi
+
+log_begin_msg "Configuring X"
+
locale=en_US.UTF-8
locale=en_US.UTF-8
-mount -
n -
o bind /sys /root/sys
-mount -
n -
o bind /proc /root/proc
-mount -
n -
o bind /dev /root/dev
+mount -o bind /sys /root/sys
+mount -o bind /proc /root/proc
+mount -o bind /dev /root/dev
if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]
then
if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]
then
@@
-77,7
+82,9
@@
${setmodel}
${setoptions}
EOF
${setoptions}
EOF
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg
+DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg 2>&1 \
+ | grep -v "overwriting possibly-customised configuration" \
+ | grep -v "file; backup in /etc/X11/xorg.conf"
umount /root/sys
umount /root/proc
umount /root/dev
umount /root/sys
umount /root/proc
umount /root/dev