X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F20xconfig;h=abd96614458b69e85dabfaeeaea3e8feb793218b;hb=11c0be9cf9aaaebfb87badf96a4b2dabcac682ba;hp=161215b2139b75e5d0fcac19909e0a22b23e519d;hpb=ccea277caf476cdfef4c0f953df5a97062d8be42;p=live-boot-grml.git

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 161215b..abd9661 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -18,59 +18,104 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
-. /scripts/live-functions
+if [ -n "${NOXAUTOCONFIG}" ]
+then
+	exit 0
+fi
 
-log_begin_msg "Configuring X..."
+. /scripts/live-functions
 
-# live-initramfs script
+# live-boot 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 [ -n "${TEXTONLY}" ]
+then
+	exit 0
 fi
 
-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 [ ! -x /root/usr/bin/X ]
+then
+	exit 0
 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}
+log_begin_msg "Configuring X"
+
+if ! grep -q xforcevesa /proc/cmdline 2>&1 >/dev/null
+then
+	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
+
+	locale=en_US.UTF-8
+
+	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
+
+	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-boot > /dev/null << EOF
+${setlayout}
 ${setvariant}
 ${setmodel}
 ${setoptions}
 EOF
-fi
 
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg
-umount /root/sys
-umount /root/proc
-umount /root/dev
+	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
+
+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