X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fdistro-install-common%2Fend;fp=fai%2Fconfig%2Fdistro-install-common%2Fend;h=8ae323c7c805ccb68cb61a9979a57bd33df50475;hb=b231c7038b1d0b6143f14a1a5efb90cd62aae876;hp=a6bc1137c56721a1eebee75080c4afd22b31188a;hpb=f664dba85a21a70e2ab2fde5a8d0c44dfa7dc18f;p=automated-distro-installer diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end index a6bc113..8ae323c 100755 --- a/fai/config/distro-install-common/end +++ b/fai/config/distro-install-common/end @@ -17,10 +17,9 @@ if [[ -e $src && -e $dst ]]; then cp -rT $src $dst fi -TPW=/q/root/shadow/traci-simple -if ifclass tp; then - ROOTPW=/q/root/shadow/standard - # ROOTPW="$TPW" +USER2PW=/q/root/shadow/user2 +if ifclass ziva; then + ROOTPW=/q/root/shadow/ziva else ROOTPW=/q/root/shadow/standard fi @@ -58,12 +57,12 @@ fi au iank chpw iank "$ROOTPW" -au traci +au user2 if ifclass frodo; then - chpw traci "$TPW" + chpw user2 "$USER2PW" fi -# comparing iank's groups to traci, I see none she should join on arch -$ROOTCMD usermod -a -G traci iank +# comparing iank's groups to user2, I see none she should join on arch +$ROOTCMD usermod -a -G user2 iank $ROOTCMD getent group docker &>/dev/null || $ROOTCMD groupadd -r docker