Adding upstream version 1.154.1.

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

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index 944bd33..23eb212 100755 (executable)
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -20,17 +20,27 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOXAUTOCONFIG}" ]
+then
+       exit 0
+fi
+
+if [ ! -x /root/usr/bin/X ]
+then
+       exit 0
+fi
+
 . /scripts/live-functions
 
-log_begin_msg "Configuring X kludges..."
+log_begin_msg "Configuring X video modes"
 
 # live-initramfs 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
+       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}