projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expose (selected) config vars to fai scripts
[grml-live.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
6ca33c7
..
ac63a8d
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
@@
-8,11
+8,7
@@
set -u
set -e
set -u
set -e
-
-USERNAME=''
-[ -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
+. "$GRML_LIVE_CONFIG"
if grep -q "$USERNAME:x:1000" $target/etc/group ; then
echo "group $USERNAME exists already, skipping"
if grep -q "$USERNAME:x:1000" $target/etc/group ; then
echo "group $USERNAME exists already, skipping"
@@
-68,12
+64,6
@@
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