From: Daniel Baumann <daniel@debian.org>
Date: Fri, 16 Oct 2009 11:56:29 +0000 (+0200)
Subject: Adding auto value for xvideomode where we ensure that no configuration from the persi... 
X-Git-Tag: debian/2.0.15-1~277
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=62f9e4e66f78e4a3bba7cd438b15b790f60954df;hp=11bf283c87c23840f824053b7a009d8ce3c4a6d1;p=live-boot-grml.git

Adding auto value for xvideomode where we ensure that no configuration from the persistency layer is respected.
---

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index 489fc5c..1312530 100755
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -40,6 +40,13 @@ log_begin_msg "Configuring X video modes"
 
 . /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