From: Kai Hendry <hendry@iki.fi>
Date: Thu, 29 Jan 2009 23:07:27 +0000 (+0100)
Subject: Adding basic xrandr support for lenny to enforce a particular resolution through... 
X-Git-Tag: debian/1.154.8-1~1
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=849a3d4cbee9743b70c515cf34619b3730637517;p=live-boot-grml.git

Adding basic xrandr support for lenny to enforce a particular resolution through bootparameter.
---

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index ead3a6c..489fc5c 100755
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -30,6 +30,8 @@ then
 	exit 0
 fi
 
+[ -n "$XVIDEOMODE" ] || exit
+
 . /scripts/live-functions
 
 log_begin_msg "Configuring X video modes"
@@ -38,8 +40,15 @@ log_begin_msg "Configuring X video modes"
 
 . /live.vars
 
-if [ -n "$XVIDEOMODE" ]
+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