Adding upstream version 1.81+debian.

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

diff --git a/scripts/casper-bottom/20xconfig b/scripts/casper-bottom/20xconfig
index 840200d..b6e7550 100755 (executable)
--- a/scripts/casper-bottom/20xconfig
+++ b/scripts/casper-bottom/20xconfig
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Configuring X..."
 
-. /scripts/functions
+. /scripts/casper-functions
 
 prereqs()
 {
@@ -33,12 +33,20 @@ for x in $(cat /proc/cmdline); do
                         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
 
+if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]; then
+    # xdebconfigurator
+    chroot /root /usr/sbin/xdebconfigurator
+fi
+
 chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
 set xserver-xorg/autodetect_keyboard true
 fset xserver-xorg/autodetect_keyboard seen true