X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F21-usersetup;h=bc09c1f3692fd41f9163d25d451ea866b0108da4;hp=123e39cbeacf203aeaf682de115aa4489c4207fc;hb=HEAD;hpb=4c8f1b588d6871adaaad9d56f75f0c6a581ec7ac diff --git a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup index 123e39c..50d43e6 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup @@ -26,7 +26,7 @@ fi add_user_to_group() { [ -n "$1" ] || return 1 if grep -q $1 $target/etc/group ; then - grep "$1:x:.*$USERNAME" $target/etc/group || $ROOTCMD addgroup $USERNAME $1 + grep "$1:x:.*$USERNAME" $target/etc/group || $ROOTCMD adduser $USERNAME $1 fi } @@ -35,12 +35,14 @@ add_user_to_group camera add_user_to_group cdrom add_user_to_group dialout add_user_to_group dip +add_user_to_group disk add_user_to_group fax add_user_to_group floppy add_user_to_group fuse add_user_to_group games -add_user_to_group nvram +add_user_to_group input add_user_to_group netdev +add_user_to_group nvram add_user_to_group plugdev add_user_to_group scanner add_user_to_group sudo @@ -48,6 +50,7 @@ add_user_to_group tape add_user_to_group tty add_user_to_group usb add_user_to_group users +add_user_to_group vboxsf add_user_to_group video add_user_to_group vlock add_user_to_group voice @@ -55,7 +58,7 @@ add_user_to_group voice sed -i 's/^root::/root:*:/' $target/etc/shadow sed -i "s/^$USERNAME:!:/$USERNAME:*:/" $target/etc/shadow -if [ -r $target/bin/zsh ] ; then +if $ROOTCMD [ -r /bin/zsh ] ; then $ROOTCMD chsh -s /bin/zsh root $ROOTCMD chsh -s /bin/zsh $USERNAME fi