projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restoring opt-in behavior for local swap partitions.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
21xvidemode
diff --git
a/scripts/live-bottom/21xvidemode
b/scripts/live-bottom/21xvidemode
index
23eb212
..
1312530
100755
(executable)
--- a/
scripts/live-bottom/21xvidemode
+++ b/
scripts/live-bottom/21xvidemode
@@
-30,14
+30,32
@@
then
exit 0
fi
exit 0
fi
+[ -n "$XVIDEOMODE" ] || exit
+
. /scripts/live-functions
log_begin_msg "Configuring X video modes"
# live-initramfs script
. /scripts/live-functions
log_begin_msg "Configuring X video modes"
# live-initramfs script
-if [ -n "$XVIDEOMODE" ]
+. /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
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
mount -o bind /sys /root/sys
mount -o bind /proc /root/proc
mount -o bind /dev /root/dev