From: Julian Langschaedel <meta.rb@gmail.com>
Date: Thu, 17 Sep 2009 06:02:57 +0000 (+0200)
Subject: config_x_startup() locate /bin/X
X-Git-Tag: v0.8.31~2
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=f21f38e48993f754f976e5e6a7bddc2f60b6cbfb;hp=f9f92864d1e46ceeb77297fe8f13405c1a6c8d2f

config_x_startup() locate /bin/X

no /usr/X11R6/bin/X found in squeeze
---

diff --git a/autoconfig.functions b/autoconfig.functions
index c9e4ff5..53a8774 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1887,7 +1887,7 @@ config_x_startup(){
 # make sure we start X only if startx is used *before* a nostartx option
 # so it's possible to disable automatic X startup using nostart
 if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; then
- if [ -x /usr/X11R6/bin/X ] ; then
+ if [ -x $(which X) ] ; then
   if [ -z "$INSTALLED" ] ; then
    WINDOWMANAGER="$(getbootparam 'startx' 2>>$DEBUG)"
    if [ -z "$WINDOWMANAGER" ] ; then