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

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index 27d943e..24116e9 100755
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -1,24 +1,40 @@
 #!/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 "${NOXAUTOCONFIG}" ]
+then
+	exit 0
+fi
+
+if [ ! -x /root/usr/bin/X ]
+then
+	exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Configuring X video modes"
+
+# live-initramfs script
 
 if [ -n "$XVIDEOMODE" ]
 then