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
changes for bullseye
[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 2871106fbc593a0196242fcc2074c0e86fe2a79f..ec0d1cf9ad633ac60600b77394c579187c4ca32f 100755
(executable)
--- a/
fai/config/distro-install-common/end
+++ b/
fai/config/distro-install-common/end
@@
-19,10
+19,10
@@
if [[ -e $src && -e $dst ]]; then
fi
USER2PW=/q/root/shadow/user2
fi
USER2PW=/q/root/shadow/user2
-if ifclass ziva; then
- ROOTPW=/q/root/shadow/ziva
-else
- ROOTPW=/q/root/shadow/
standard
+# if doesn't exist, we dont set one
+ROOTPW=/q/root/shadow/standard
+if [[ ! -e $ROOTPW ]]; then
+ ROOTPW=/q/root/shadow/
$HOSTNAME
fi
chpw() {
fi
chpw() {
@@
-41,8
+41,9
@@
chpw() {
fi
}
au() { # add user. i don't use adduser for portability
fi
}
au() { # add user. i don't use adduser for portability
- if ! $ROOTCMD getent passwd ${@: -1}; then
- $ROOTCMD useradd -Um -s /bin/bash $@
+ local user=${@: -1}
+ if ! $ROOTCMD getent passwd $user; then
+ $ROOTCMD useradd -c $user -Um -s /bin/bash $@
fi
}
fi
}