X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fdistro-install-common%2Fend;h=a7745b7bbf44241512822648706470b00fe0d0e5;hb=ac4e0089e245c96a388b8fcdd92fc05da3399694;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..a7745b7 100755
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -17,13 +17,14 @@ if [[ -e $src && -e $dst ]]; then
     cp -rT $src $dst
 fi
 
-if ifclass VOL_STABLE_BOOTSTRAP; then
+if ifclass VOL_STRETCH_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,9 +44,9 @@ 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
 }
 
@@ -96,4 +97,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