projects
/
grml-autoconfig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9f9286
)
config_x_startup() locate /bin/X
author
Julian Langschaedel
<meta.rb@gmail.com>
Thu, 17 Sep 2009 06:02:57 +0000
(08:02 +0200)
committer
Michael Prokop
<mika@grml.org>
Mon, 21 Sep 2009 16:35:17 +0000
(18:35 +0200)
no /usr/X11R6/bin/X found in squeeze
autoconfig.functions
patch
|
blob
|
history
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
c9e4ff5
..
53a8774
100755
(executable)
--- 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