dirinstall fixes/improvements, other minor changes

[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 d10b9497d11d3ac2b4f07098e780b0567e7c30ae..a7745b7bbf44241512822648706470b00fe0d0e5 100755 (executable)
--- 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
 }