projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Also allowing hook= to specify files inside the image through file:// prefix.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
21xvidemode
diff --git
a/scripts/live-bottom/21xvidemode
b/scripts/live-bottom/21xvidemode
index
489fc5c
..
1312530
100755
(executable)
--- a/
scripts/live-bottom/21xvidemode
+++ b/
scripts/live-bottom/21xvidemode
@@
-40,6
+40,13
@@
log_begin_msg "Configuring X video modes"
. /live.vars
. /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 [ $(cat /root/etc/debian_version | sed 's|\..*$||') -ge 4 ]
then
# lenny or newer