X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Flive-bottom%2F21xvidemode;h=3fb91900c2289f7b6e3b18e6a8c056a14d172322;hb=15eba58b6d201ca6881f2d96753381afc0039cc8;hp=27d943e76936dc69224f8c21bd031dcd550d78ea;hpb=0a854a1e9307affdeaf96cb3ec0c864b171d66ca;p=live-boot-grml.git

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index 27d943e..3fb9190 100755
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -1,41 +1,55 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Configuring X kludges..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
 
-if [ -n "$XVIDEOMODE" ]
+if [ -n "${NOXAUTOCONFIG}" ]
 then
-	mount -n -o bind /sys /root/sys
-	mount -n -o bind /proc /root/proc
-	mount -n -o bind /dev /root/dev
+	exit 0
+fi
 
-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 [ ! -x /root/usr/bin/X ]
+then
+	exit 0
+fi
 
-	chroot /root dexconf
+[ -n "$XVIDEOMODE" ] || exit
+
+. /scripts/live-functions
 
-	umount /root/sys
-	umount /root/proc
-	umount /root/dev
+log_begin_msg "Configuring X video modes"
+
+# live-initramfs script
+
+. /live.vars
+
+if [ "${XVIDEOMODE}" = "auto" ]
+then
+	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