iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 d10b9497d11d3ac2b4f07098e780b0567e7c30ae..3948073df0ec311cbc01bc9efe63e52011b3409a 100755
(executable)
--- 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
cp -rT $src $dst
fi
-if ifclass VOL_STABLE_BOOTSTRAP; then
- exit 0
-fi
-
TPW=/q/root/shadow/traci-simple
if ifclass tp; then
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
else
ROOTPW=/q/root/shadow/standard
fi
@@
-43,14
+40,21
@@
chpw() {
echo "$0: warning: no pw set for $user" >&2
fi
}
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
if ! $ROOTCMD getent passwd ${@: -1}; then
- $ROOTCMD useradd -m -s /bin/bash $@
+ $ROOTCMD useradd -
U
m -s /bin/bash $@
fi
}
chpw root "$ROOTPW"
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"
au iank
chpw iank "$ROOTPW"