X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fdistro-install-common%2Fend;h=3948073df0ec311cbc01bc9efe63e52011b3409a;hb=f26c5d66d11fc97c3c6a17a3647dad5d1922fe5a;hp=cb953a4e8073a562e864dd12a075f1aef7e54215;hpb=645ab36988f8eed2e85d066bdf1ad8a12e7aabc0;p=automated-distro-installer diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end index cb953a4..3948073 100755 --- a/fai/config/distro-install-common/end +++ b/fai/config/distro-install-common/end @@ -17,13 +17,10 @@ if [[ -e $src && -e $dst ]]; then cp -rT $src $dst fi -if ifclass VOL_STABLE_BOOTSTRAP; then - exit 0 -fi - TPW=/q/root/shadow/traci-simple if ifclass tp; then - ROOTPW="$TPW" + ROOTPW=/q/root/shadow/standard +# ROOTPW="$TPW" else ROOTPW=/q/root/shadow/standard fi @@ -43,14 +40,21 @@ chpw() { echo "$0: warning: no pw set for $user" >&2 fi } -au() { # add user +au() { # add user. i don't use adduser for portability if ! $ROOTCMD getent passwd ${@: -1}; then - $ROOTCMD useradd -m -s /bin/bash $@ + $ROOTCMD useradd -Um -s /bin/bash $@ fi } chpw root "$ROOTPW" -# 9 = user already exists. so we are idempotent. + +# only setup root pass for bootstrap vol +if ifclass VOL_STRETCH_BOOTSTRAP; then + exit 0 +fi + + +# return of 9 = user already exists. so we are idempotent. au iank chpw iank "$ROOTPW" @@ -96,4 +100,4 @@ while true; do if [[ $dir == /p ]]; then break; fi done -au -s /bin/false --home-dir /var/lib/bitcoind bitcoin +au --system -s /bin/false --home-dir /var/lib/bitcoind bitcoin