Adding upstream version 1.177.1.

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

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index ead3a6c..3fb9190 100755 (executable)
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -30,6 +30,8 @@ then
        exit 0
 fi
 
+[ -n "$XVIDEOMODE" ] || exit
+
 . /scripts/live-functions
 
 log_begin_msg "Configuring X video modes"
@@ -38,22 +40,16 @@ log_begin_msg "Configuring X video modes"
 
 . /live.vars
 
-if [ -n "$XVIDEOMODE" ]
+if [ "${XVIDEOMODE}" = "auto" ]
 then
-       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}
-set xserver-xorg/config/display/modes ${XVIDEOMODE}
-EOF
+       rm -f /root/etc/X11/Xsession.d/21xvidemode
 
-       chroot /root dexconf
+       exit 0
+fi
 
-       umount /root/sys
-       umount /root/proc
-       umount /root/dev
+if [ -x "$(which xrandr 2>/dev/null)" ]
+then
+       echo "xrandr -s ${XVIDEOMODE} || /bin/true" >> /root/etc/X11/Xsession.d/21xvidemode
 fi
 
 log_end_msg