X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F20xconfig;h=f6a3f8d58c67b5c7ddcda0763f6e271fde69da1c;hb=5259e901201bd6c98467841fb697c86932c4e493;hp=c06a505f6e13a6e776af5e030d6a6126557add06;hpb=cf052ec1816745240c65745a0de6cc4dce8c8433;p=live-boot-grml.git diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig index c06a505..f6a3f8d 100755 --- a/scripts/live-bottom/20xconfig +++ b/scripts/live-bottom/20xconfig @@ -41,7 +41,7 @@ then exit 0 fi -if [ -x /root/usr/bin/X ] +if [ ! -x /root/usr/bin/X ] then exit 0 fi @@ -50,9 +50,9 @@ log_begin_msg "Configuring X" 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 @@ -82,8 +82,9 @@ ${setmodel} ${setoptions} EOF -DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg 2>&1 \ - grep -v "overwriting possibly-customised configuration file" +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