projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not run sysv specific serial console setup under systemd
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
a942f13
..
2996eb6
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-590,6
+590,11
@@
config_timezone(){
# activate serial console {{{
config_console(){
if checkbootparam 'console'; then
# activate serial console {{{
config_console(){
if checkbootparam 'console'; then
+ # this hack is no longer necessary with systemd
+ if $SYSTEMD ; then
+ return
+ fi
+
local line
local ws
ws=' '
local line
local ws
ws=' '
@@
-1375,9
+1380,9
@@
if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t
if $SYSTEMD ; then
cat>|/etc/init.d/startx<<EOF
#!/bin/sh
if $SYSTEMD ; then
cat>|/etc/init.d/startx<<EOF
#!/bin/sh
-chgrp tty ${TTY}
-chmod g=rw ${TTY}
-sudo -u "${localuser}" /usr/bin/grml-x
"${WINDOWMANAGER}"
+chgrp tty
\
${TTY}
+chmod g=rw
\
${TTY}
+sudo -u "${localuser}" /usr/bin/grml-x
${WINDOWMANAGER}
EOF
chmod 755 /etc/init.d/startx
chvt 6
EOF
chmod 755 /etc/init.d/startx
chvt 6