projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace references to zsh-login with run-welcome
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
a9c5043
..
a0846d9
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-594,7
+594,7
@@
if checkbootparam 'console'; then
eindent
einfo "Activating console login on device ${device} with speed ${speed}."
local number="${device#ttyS}"
eindent
einfo "Activating console login on device ${device} with speed ${speed}."
local number="${device#ttyS}"
- sed -i "/^T$number:/d;/^#grmlserial#/iT$number:23:respawn:/bin/bash -c \"/sbin/getty -L $device -l /usr/
bin/zsh-login
$speed vt100 || sleep 30\"" /etc/inittab
+ sed -i "/^T$number:/d;/^#grmlserial#/iT$number:23:respawn:/bin/bash -c \"/sbin/getty -L $device -l /usr/
share/grml-scripts/run-welcome
$speed vt100 || sleep 30\"" /etc/inittab
eend $?
telinitq="1"
eoutdent
eend $?
telinitq="1"
eoutdent
@@
-1407,9
+1407,9
@@
EOF
# adjust inittab for xstartup
if grep -q '^6:' /etc/inittab ; then
# adjust inittab for xstartup
if grep -q '^6:' /etc/inittab ; then
- sed -i 's|^6:.*|6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /usr/
bin/zsh-login
" >/dev/tty6 2>\&1 </dev/tty6|' /etc/inittab
+ sed -i 's|^6:.*|6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /usr/
share/grml-scripts/run-welcome
" >/dev/tty6 2>\&1 </dev/tty6|' /etc/inittab
else # just append tty6 to inittab if no definition is present:
else # just append tty6 to inittab if no definition is present:
- echo '6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /usr/
bin/zsh-login
" >/dev/tty6 2>&1 < /dev/tty6' >> /etc/inittab
+ echo '6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /usr/
share/grml-scripts/run-welcome
" >/dev/tty6 2>&1 < /dev/tty6' >> /etc/inittab
fi
/sbin/telinit q ; eend $?
fi
/sbin/telinit q ; eend $?