X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F20xconfig;h=e2839b21bfcad497df69d671f0b3ea5543a24454;hb=refs%2Ftags%2Fupstream%2F1.236.2;hp=902335e469c68ec862d5bda8454cc3f9605f5eda;hpb=cb896241d0ec8eb2bba0cecd11de3500869176a6;p=live-boot-grml.git

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 902335e..e2839b2 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -27,39 +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 /etc/rc?.d/S??[gxk]dm
 	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 ]
+if [ ! -x /root/usr/bin/X ]
 then
-	# xdebconfigurator
-	chroot /root /usr/sbin/xdebconfigurator
+	exit 0
 fi
 
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+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
 
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set xserver-xorg/autodetect_keyboard true
-fset xserver-xorg/autodetect_keyboard seen true
-EOF
+	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
 
-else
-	# d-i code not present, so:
 	if [ -n "${KOPTIONS}" ]
 	then
 		setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
@@ -75,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