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:
13ba17a
)
fix config_x_startup()
author
lian
<meta.rb@gmail.com>
Tue, 8 Sep 2009 00:56:13 +0000
(
02:56
+0200)
committer
Michael Prokop
<mika@grml.org>
Tue, 8 Sep 2009 01:16:04 +0000
(
03:16
+0200)
autoconfig.functions
patch
|
blob
|
history
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
b8579b7
..
50fdf81
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-1850,7
+1850,7
@@
create_mnt_dirs(){
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
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' && !
grep -q 'startx.*nostartx' "$CMDLINE"
; then
+if checkbootparam 'startx' && !
echo "$CMDLINE" | grep -q 'startx.*nostartx'
; then
if [ -x /usr/X11R6/bin/X ] ; then
if [ -z "$INSTALLED" ] ; then
WINDOWMANAGER="$(getbootparam 'startx' 2>>$DEBUG)"
if [ -x /usr/X11R6/bin/X ] ; then
if [ -z "$INSTALLED" ] ; then
WINDOWMANAGER="$(getbootparam 'startx' 2>>$DEBUG)"