X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F32-xorg;h=238af5da5bef0af3439332f082ea88b9cdc16f0a;hb=8d91fa8e1b3b6d46a1333928a7384a463868cce0;hp=60d61dc2dbcc162b2d54dcbf532fd0878b124394;hpb=f9e99174221e1035d0eec78ff68d0c65bdc3fba4;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/32-xorg b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg
index 60d61dc..238af5d 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/32-xorg
+++ b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg
@@ -1,10 +1,9 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/32-xorg
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/32-xorg
 # Purpose:       make sure there does not exist /etc/X11/xorg.conf by default
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Sun Sep 16 23:17:08 CEST 2007 [mika]
 ################################################################################
 
 set -u
@@ -14,5 +13,10 @@ if [ -r "$target/etc/X11/xorg.conf" ] ; then
    mv -f "$target"/etc/X11/xorg.conf "$target"/etc/X11/xorg.conf.debian
 fi
 
+if [ "$(readlink $target/etc/X11/X)" = "/bin/true" ] ; then
+   echo "Warning: /etc/X11/X is a symlink to /bin/true - fixing for you">&2
+   ln -sf /usr/bin/Xorg $target/etc/X11/X
+fi
+
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2