minor files

[automated-distro-installer] / fai / config / distro-install-common / end

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 54a7b43d66289e741392a8b0e0f1041f1dc47261..3948073df0ec311cbc01bc9efe63e52011b3409a 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -17,10 +17,6 @@ if [[ -e $src && -e $dst ]]; then
     cp -rT $src $dst
 fi
 
-if ifclass VOL_STRETCH_BOOTSTRAP; then
-    exit 0
-fi
-
 TPW=/q/root/shadow/traci-simple
 if ifclass tp; then
     ROOTPW=/q/root/shadow/standard
@@ -44,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"