X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F21xvidemode;h=1312530785fa2439f76a0798063a3e3b287d4a4b;hb=170a01e0a2064de0d5a5fdee79611c7886d1554c;hp=944bd33a6a72ecf03c6e6e2f0acb1193e7c162f8;hpb=cdb98bbbdc41b29c6b94dc5aed36393daec84cf8;p=live-boot-grml.git

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index 944bd33..1312530 100755
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -20,17 +20,45 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOXAUTOCONFIG}" ]
+then
+	exit 0
+fi
+
+if [ ! -x /root/usr/bin/X ]
+then
+	exit 0
+fi
+
+[ -n "$XVIDEOMODE" ] || exit
+
 . /scripts/live-functions
 
-log_begin_msg "Configuring X kludges..."
+log_begin_msg "Configuring X video modes"
 
 # live-initramfs script
 
-if [ -n "$XVIDEOMODE" ]
+. /live.vars
+
+if [ "${XVIDEOMODE}" = "auto" ]
+then
+	rm -f /root/etc/X11/Xsession.d/21xvidemode
+
+	exit 0
+fi
+
+if [ $(cat /root/etc/debian_version | sed 's|\..*$||') -ge 4 ]
 then
-	mount -n -o bind /sys /root/sys
-	mount -n -o bind /proc /root/proc
-	mount -n -o bind /dev /root/dev
+	# lenny or newer
+	if [ -x "$(which xrandr 2>/dev/null)" ]
+	then
+		echo "xrandr -s ${XVIDEOMODE} || /bin/true" >> /root/etc/X11/Xsession.d/21xvidemode
+	fi
+else
+	# etch
+	mount -o bind /sys /root/sys
+	mount -o bind /proc /root/proc
+	mount -o bind /dev /root/dev
 
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
 set xserver-xorg/config/monitor/mode-list ${XVIDEOMODE}