X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F21-usersetup;h=ac63a8d7b8785fb34b43d25e6e6047c26dac1bb5;hb=79a11834165d11dd29c62d200aad37fe164d667a;hp=375b52d25a20bf1721165988d0f66160ff71985f;hpb=f66079ee8a7bbaa0cf304b491988299313fce54a;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
index 375b52d..ac63a8d 100755
--- 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
-
-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"
@@ -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
 
-# 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
-fi
-
 if [ -r $target/bin/zsh ] ; then
    $ROOTCMD chsh -s /bin/zsh root
    $ROOTCMD chsh -s /bin/zsh $USERNAME