X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F21xvidemode;h=ac28fad580b74712ee8f822ef38f1fb6f462ff3f;hb=e66f79476042794195978ee641aa7ea0d9ca6e0a;hp=75014487ed8af65f2d2944b4afab6ebc5c712900;hpb=5f0f3b0c36d433a462176f970d371c77c3020749;p=live-boot-grml.git

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index 7501448..ac28fad 100755
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -18,35 +18,38 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 if [ -n "${NOXAUTOCONFIG}" ]
 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
+# live-boot script
 
-if [ -n "$XVIDEOMODE" ]
-then
-	mount -n -o bind /sys /root/sys
-	mount -n -o bind /proc /root/proc
-	mount -n -o bind /dev /root/dev
+. /live.vars
 
-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
+if [ "${XVIDEOMODE}" = "auto" ]
+then
+	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