X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F20xconfig;h=3e927a3b847836ab435daf6bb25ba8f7dc59e721;hb=9c7e05ec599f1cae40b240c4e49a5cfe86b7de5d;hp=4a80b213dd555f45589a31805f9e17e349e08995;hpb=8bd41d1a551a814aa8c2cb6de09640fba6798f21;p=live-boot-grml.git diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig index 4a80b21..3e927a3 100755 --- a/scripts/live-bottom/20xconfig +++ b/scripts/live-bottom/20xconfig @@ -27,8 +27,6 @@ fi . /scripts/live-functions -log_begin_msg "Configuring X" - # live-initramfs script if [ "${TERM_TYPE}" = "serial" ] @@ -43,11 +41,13 @@ then exit 0 fi -if [ -x /root/usr/bin/X ] +if [ ! -x /root/usr/bin/X ] then exit 0 fi +log_begin_msg "Configuring X" + locale=en_US.UTF-8 mount -n -o bind /sys /root/sys @@ -83,7 +83,8 @@ ${setoptions} EOF DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg 2>&1 \ - grep -v "overwriting possibly-customised configuration file" + | grep -v "overwriting possibly-customised configuration" \ + | grep -v "file; backup in /etc/X11/xorg.conf" umount /root/sys umount /root/proc umount /root/dev