X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F20xconfig;h=c5563ed6bb4ea19da573ac3b69f775384c5cb0d1;hb=4bdaa2237c6ae923d1dd068e9024ebceca3f40d9;hp=470f54c8092a2a66f55e031711bb57c50b0fbaca;hpb=c972c6eea545add125883eaaeea459551e54589c;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/20xconfig b/scripts/casper-bottom/20xconfig
index 470f54c..c5563ed 100755
--- a/scripts/casper-bottom/20xconfig
+++ b/scripts/casper-bottom/20xconfig
@@ -5,7 +5,6 @@ DESCRIPTION="Configuring X..."
 
 . /scripts/casper-functions
 
-
 prereqs()
 {
        echo "$PREREQ"
@@ -27,41 +26,36 @@ if [ "$TERM_TYPE" = "serial" ]; then
     exit 0
 fi
 
+locale=en_US.UTF-8
+
+for x in $(cat /proc/cmdline); do
+                case $x in
+                        debian-installer/locale=*)
+                                locale=${x#debian-installer/locale=}
+                                ;;
+                        locale=*)
+                                locale=${x#locale=}
+                                ;;
+                esac
+done
+
 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
 fi
 
-if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
-    chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
+chroot /root debconf-communicate -fnoninteractive casper > /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 casper > /dev/null <<EOF
-set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
-${setvariant}
-${setmodel}
-${setoptions}
-EOF
-fi
 
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 casper-reconfigure /root xserver-xorg
+DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 | sed -e 's, .*,,' -e q) casper-reconfigure /root xserver-xorg
 umount /root/sys
 umount /root/proc
+umount /root/dev
 
 log_end_msg