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

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index 489fc5c..ac28fad 100755
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -18,7 +18,7 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 if [ -n "${NOXAUTOCONFIG}" ]
 then
@@ -36,33 +36,20 @@ fi
 
 log_begin_msg "Configuring X video modes"
 
-# live-initramfs script
+# live-boot script
 
 . /live.vars
 
-if [ $(cat /root/etc/debian_version | sed 's|\..*$||') -ge 4 ]
+if [ "${XVIDEOMODE}" = "auto" ]
 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
-
-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
-
-	chroot /root dexconf
-
-	umount /root/sys
-	umount /root/proc
-	umount /root/dev
+	rm -f /root/etc/X11/Xsession.d/21xvidemode
+
+	exit 0
+fi
+
+if [ -x "$(which xrandr 2>/dev/null)" ]
+then
+	echo "xrandr -s ${XVIDEOMODE} || /bin/true" >> /root/etc/X11/Xsession.d/21xvidemode
 fi
 
 log_end_msg