X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Flive-bottom%2F20xconfig;h=3e927a3b847836ab435daf6bb25ba8f7dc59e721;hb=8088c0fc9a08f024c32f854b9871fb5bc5de3458;hp=93c872208f12e026fce5ac5b101d840812e8ba09;hpb=9fc9e2a1a11b0edada38cb501fefe4f58aa414ac;p=live-boot-grml.git

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 93c8722..3e927a3 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -1,59 +1,90 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Configuring X..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
 
-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 [ -n "${NOXAUTOCONFIG}" ]
+then
+	exit 0
 fi
 
-locale=en_US.UTF-8
+. /scripts/live-functions
 
-for x in $(cat /proc/cmdline); do
-                case $x in
-                        debian-installer/locale=*)
-                                locale=${x#debian-installer/locale=}
-                                ;;
-                        locale=*)
-                                locale=${x#locale=}
-                                ;;
-                esac
-done
+# live-initramfs script
+
+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
 
-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 [ -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/autodetect_keyboard true
-fset xserver-xorg/autodetect_keyboard seen true
+chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
+set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
+${setvariant}
+${setmodel}
+${setoptions}
 EOF
 
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 | sed -e 's, .*,,' -e q) 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