Integrate feedback from Thomas Lange (thanks for the review!)

[grml-live-grml.git] / etc / grml / fai / config / scripts / GRML / 21-usersetup

diff --git a/etc/grml/fai/config/scripts/GRML/21-usersetup b/etc/grml/fai/config/scripts/GRML/21-usersetup
index bc53220..87d5ad2 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML/21-usersetup
+++ b/etc/grml/fai/config/scripts/GRML/21-usersetup
@@ -2,11 +2,15 @@
 set -u
 set -e
 
-chroot "$target" addgroup --gid 1000 grml
-chroot "$target" useradd -d /home/grml -m -s /bin/zsh -g 1000 grml
+USERNAME=''
+[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -n "$USERNAME" ] || USERNAME=grml
 
-sed -i 's/^root::/root:*:/' "$target"/etc/shadow
-sed -i 's/^grml::/grml:*:/' "$target"/etc/shadow
+$ROOTCMD addgroup --gid 1000 $USERNAME
+$ROOTCMD useradd -d /home/$USERNAME -m -s /bin/zsh -g 1000 $USERNAME
 
-chroot "$target" chsh -s /bin/zsh root
-chroot "$target" chsh -s /bin/zsh grml
+sed -i 's/^root::/root:*:/' $target/etc/shadow
+sed -i 's/^$USERNAME::/$USERNAME:*:/' $target/etc/shadow
+
+$ROOTCMD chsh -s /bin/zsh root
+$ROOTCMD chsh -s /bin/zsh $USERNAME