Adding upstream version 1.173.1.

[live-boot-grml.git] / scripts / live-bottom / 20xconfig

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 161215b..d06b2d6 100755 (executable)
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -20,55 +20,76 @@ esac
 
 # live-initramfs header
 
-. /scripts/live-functions
+if [ -n "${NOXAUTOCONFIG}" ]
+then
+       exit 0
+fi
 
-log_begin_msg "Configuring X..."
+. /scripts/live-functions
 
 # live-initramfs script
 
-if [ "$TERM_TYPE" = "serial" ]; then
-    # Don't bother trying to configure or start X on a serial console
-    rm -f /etc/rc?.d/S??[gxk]dm
-    exit 0
+if [ "${TERM_TYPE}" = "serial" ]
+then
+       # Don't bother trying to configure or start X on a serial console
+       rm -f /root/etc/rc?.d/S??[gkx]dm
+       exit 0
+fi
+
+if [ -n "${TEXTONLY}" ]
+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
-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
-    # xdebconfigurator
-    chroot /root /usr/sbin/xdebconfigurator
+if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]
+then
+       # xdebconfigurator
+       chroot /root /usr/sbin/xdebconfigurator
 fi
 
-if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
-    chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
-set xserver-xorg/autodetect_keyboard true
-fset xserver-xorg/autodetect_keyboard seen true
-EOF
-else
-    # d-i code not present, so:
-    if [ -n "${KOPTIONS}" ]; then
-        setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
-    fi
-    if [ -n "${KVARIANT}" ]; then
-        setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
-    fi
-    if [ -n "${KMODEL}" ]; then
-        setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
-    fi
-
-    chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
-set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
+if [ -n "${KOPTIONS}" ]
+then
+       setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
+fi
+
+if [ -n "${KVARIANT}" ]
+then
+       setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
+fi
+
+if [ -n "${KMODEL}" ]
+then
+       setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
+fi
+
+if [ -n "${KLAYOUT}" ]
+then
+       setlayout="set xserver-xorg/config/inputdevice/keyboard/layout ${KLAYOUT}"
+fi
+
+chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
+${setlayout}
 ${setvariant}
 ${setmodel}
 ${setoptions}
 EOF
-fi
 
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg
+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