Adding upstream version 1.157.4.

[live-boot-grml.git] / scripts / live-bottom / 21xvidemode

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index a11dc77..1312530 100755 (executable)
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -25,17 +25,40 @@ then
        exit 0
 fi
 
+if [ ! -x /root/usr/bin/X ]
+then
+       exit 0
+fi
+
+[ -n "$XVIDEOMODE" ] || exit
+
 . /scripts/live-functions
 
-log_begin_msg "Configuring X kludges..."
+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
-       mount -n -o bind /sys /root/sys
-       mount -n -o bind /proc /root/proc
-       mount -n -o bind /dev /root/dev
+       # 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
 
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
 set xserver-xorg/config/monitor/mode-list ${XVIDEOMODE}