X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F32-xorg;h=238af5da5bef0af3439332f082ea88b9cdc16f0a;hp=01597f55872e094da00fad610ad94a84f53bec1d;hb=184eabc67a016efb8b42364b1dab400ef72a00e0;hpb=c194b5178a55f199146d670b86508ce6a92da18a diff --git a/etc/grml/fai/config/scripts/GRMLBASE/32-xorg b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg index 01597f5..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 # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Mon Nov 26 15:10:25 CET 2007 [mika] ################################################################################ set -u @@ -14,10 +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 [ "$(readlinke $target/etc/X11/X)" = "/bin/true" ] ; then +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