fix some bugs and mix other things

[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 a7745b7bbf44241512822648706470b00fe0d0e5..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
@@ -51,7 +47,14 @@ au() { # add user. i don't use adduser for portability
 }
 
 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"