summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-10-16 13:56:29 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:06 +0100
commit62f9e4e66f78e4a3bba7cd438b15b790f60954df (patch)
tree14757136da2aa893331d07e3c188ef5166303513 /scripts
parent11bf283c87c23840f824053b7a009d8ce3c4a6d1 (diff)
downloadlive-boot-62f9e4e66f78e4a3bba7cd438b15b790f60954df.tar.gz
live-boot-62f9e4e66f78e4a3bba7cd438b15b790f60954df.zip
Adding auto value for xvideomode where we ensure that no configuration from the persistency layer is respected.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live-bottom/21xvidemode7
1 files changed, 7 insertions, 0 deletions
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