X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F21-usersetup;h=68f110b101e9a70ca91a536ebeab94cd58619517;hb=f581bd70c25791efbbec679a9d7c6001b67ead38;hp=6ca33c7343fbf3f88a2949b448470e49e35ba381;hpb=f3b335ea5c94d5cf24ec6b9184106b298849f311;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 6ca33c7..68f110b 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
@@ -11,7 +11,7 @@ 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 "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
 [ -n "$USERNAME" ] || USERNAME=grml
 
 if grep -q "$USERNAME:x:1000" $target/etc/group ; then
@@ -71,7 +71,7 @@ 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
+   $target/etc/inittab
 fi
 
 if [ -r $target/bin/zsh ] ; then