projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove further X11R6 remnants
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
c514c57
..
7a003ae
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-7,7
+7,7
@@
################################################################################
# {{{ path, variables, signals, umask, zsh
################################################################################
# {{{ path, variables, signals, umask, zsh
-export PATH="/bin:/sbin:/usr/bin:/usr/sbin
:/usr/X11R6/bin
"
+export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
DEBUG="/dev/null"
KERNEL="$(uname -r)"
ARCH="$(uname -m)"
DEBUG="/dev/null"
KERNEL="$(uname -r)"
ARCH="$(uname -m)"
@@
-551,7
+551,7
@@
eoutdent
config_fast(){
if checkbootparam 'fast'; then
ewarn "Bootoption fast detected. Skipping startup of grml-quickconfig."
config_fast(){
if checkbootparam 'fast'; then
ewarn "Bootoption fast detected. Skipping startup of grml-quickconfig."
- sed -i '
s#^1:.*#1:12345:respawn:/usr/bin/openvt -f -c 1 -w --
/bin/zsh#' /etc/inittab
+ sed -i '
/1:/s#/usr/share/grml-scripts/run-welcome#
/bin/zsh#' /etc/inittab
/sbin/telinit q ; eend $?
fi
}
/sbin/telinit q ; eend $?
fi
}
@@
-1395,7
+1395,7
@@
EOF
eerror " -> Please use something like xdm, gdm or kdm for starting X on a harddisk system!" ; eend 1
fi
else
eerror " -> Please use something like xdm, gdm or kdm for starting X on a harddisk system!" ; eend 1
fi
else
- eerror "/usr/
X11R6/
bin/X is not present on this grml flavour."
+ eerror "/usr/bin/X is not present on this grml flavour."
eerror " -> Boot parameter startx does not work therefore." ; eend 1
fi
fi
eerror " -> Boot parameter startx does not work therefore." ; eend 1
fi
fi