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

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index 23eb212..1312530 100755
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -30,14 +30,32 @@ then
 	exit 0
 fi
 
+[ -n "$XVIDEOMODE" ] || exit
+
 . /scripts/live-functions
 
 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
+	# 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