projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop eject from all grml classes as it is part of GRMLBASE; drop emacs22/-common...
[grml-live-grml.git]
/
etc
/
grml
/
fai
/
config
/
scripts
/
GRMLBASE
/
21-usersetup
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
index
a94fc7b
..
66c5680
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
@@
-4,14
+4,14
@@
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2 or any later version.
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2 or any later version.
-# Latest change: Thu Nov 15 09:42:42 CET 2007 [mika]
################################################################################
set -u
set -e
USERNAME=''
################################################################################
set -u
set -e
USERNAME=''
-[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
[ -n "$USERNAME" ] || USERNAME=grml
if grep -q "$USERNAME:x:1000" $target/etc/group ; then
[ -n "$USERNAME" ] || USERNAME=grml
if grep -q "$USERNAME:x:1000" $target/etc/group ; then
@@
-67,6
+67,12
@@
add_user_to_group voice
sed -i 's/^root::/root:*:/' $target/etc/shadow
sed -i "s/^$USERNAME:!:/$USERNAME:*:/" $target/etc/shadow
sed -i 's/^root::/root:*:/' $target/etc/shadow
sed -i "s/^$USERNAME:!:/$USERNAME:*:/" $target/etc/shadow
+# make sure users can log in on consoles 4, 5 and 6 if username != grml:
+if [ "$USERNAME" != "grml" ] ; then
+ sed -i "s/-u grml -g grml --autologin grml/-u ${USERNAME} -g ${USERNAME} --autologin ${USERNAME}/" \
+ $target/etc/inittab.grml
+fi
+
if [ -r $target/bin/zsh ] ; then
$ROOTCMD chsh -s /bin/zsh root
$ROOTCMD chsh -s /bin/zsh $USERNAME
if [ -r $target/bin/zsh ] ; then
$ROOTCMD chsh -s /bin/zsh root
$ROOTCMD chsh -s /bin/zsh $USERNAME