X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F20xconfig;h=153732a25f934345655a22787d4863650d307457;hb=e3db15425bab2e04a15cd975c7699203c2a6b104;hp=e2afe7841f0024a8c53a43c83d51d873dc12379a;hpb=046580edb4877fc1a4a823e882a0949fbc729544;p=live-boot-grml.git diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig index e2afe78..153732a 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,6 +41,13 @@ then exit 0 fi +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 @@ -77,7 +82,8 @@ ${setmodel} ${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 file" umount /root/sys umount /root/proc umount /root/dev