[SCM] live-initramfs branch, master, updated. 1.157.3-1-11-g9a829e5
Daniel Baumann
daniel at debian.org
Fri Oct 16 11:57:31 UTC 2009
The following commit has been merged in the master branch:
commit 9a829e5ae23d6140020b2cfe2e4b0fd4b2d7eb86
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Oct 16 13:56:29 2009 +0200
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
--
live-initramfs
More information about the debian-live-changes
mailing list