Merging casper 1.200.

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

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 779a1c2..e2839b2 100755 (executable)
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -27,44 +27,42 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring X..."
-
 # live-initramfs script
 
-if [ "${TERM_TYPE}" = "serial" ]
+if [ -n "${TEXTONLY}" ]
 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}" ]
+if [ ! -x /root/usr/bin/X ]
 then
        exit 0
 fi
 
-locale=en_US.UTF-8
+log_begin_msg "Configuring X"
 
-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 ]
+if ! grep -q xforcevesa /proc/cmdline 2>&1 >/dev/null
 then
-       # xdebconfigurator
-       chroot /root /usr/sbin/xdebconfigurator
-fi
+       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 [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-then
+       locale=en_US.UTF-8
 
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set xserver-xorg/autodetect_keyboard true
-fset xserver-xorg/autodetect_keyboard seen true
-EOF
+       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
+       fi
 
-else
-       # d-i code not present, so:
        if [ -n "${KOPTIONS}" ]
        then
                setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
@@ -80,18 +78,44 @@ else
                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
-set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
+${setlayout}
 ${setvariant}
 ${setmodel}
 ${setoptions}
 EOF
 
-fi
+       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
+else
 
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg
-umount /root/sys
-umount /root/proc
-umount /root/dev
+cat > /root/etc/X11/xorg.conf << EOF
+Section "Device"
+       Identifier      "Configured Video Device"
+       Driver          "vesa"
+EndSection
+
+Section "Monitor"
+       Identifier      "Configured Monitor"
+EndSection
+
+Section "Screen"
+       Identifier      "Default Screen"
+       Monitor         "Configured Monitor"
+       Device          "Configured Video Device"
+EndSection
+EOF
+
+fi
 
 log_end_msg