diff options
| author | Simon Rettberg | 2013-02-25 15:51:03 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-02-25 15:51:03 +0100 |
| commit | 365ceb07608b583ed7f0db6b420f1d1221f90839 (patch) | |
| tree | c7c51ebf001df128c8ed501a1e778e320d25cc3f /remote/tools/base | |
| parent | really fix password generation/replacement (diff) | |
| download | tm-scripts-365ceb07608b583ed7f0db6b420f1d1221f90839.tar.gz tm-scripts-365ceb07608b583ed7f0db6b420f1d1221f90839.tar.xz tm-scripts-365ceb07608b583ed7f0db6b420f1d1221f90839.zip | |
[helper] make useradd independent of tools build order, [helper] simplify logger
Diffstat (limited to 'remote/tools/base')
| -rw-r--r-- | remote/tools/base/base.build | 10 | ||||
| -rw-r--r-- | remote/tools/base/base.conf | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/remote/tools/base/base.build b/remote/tools/base/base.build index aee237a0..8a327f83 100644 --- a/remote/tools/base/base.build +++ b/remote/tools/base/base.build @@ -107,16 +107,16 @@ post_copy() { echo "# no configuration" >> "${INIT_DIR}/etc/fstab" # link /etc/mtab, needed for systemd - [ ! -e ${INIT_DIR}/etc/mtab ] && ln -s /proc/self/mounts ${INIT_DIR}/etc/mtab + [ ! -e ${INIT_DIR}/etc/mtab ] && ln -s /proc/self/mounts ${INIT_DIR}/etc/mtab + + # passwd, group, shadow + init_users_and_groups # quick fix for missing group in /etc/group add_group "lock" - # clean passwd/group files (do BEFORE setting root pw) - clean_users_and_groups "${INIT_DIR}" - # setup root accoun - USER=root PASSWORD="!r00t" add_user + USER=root PASSWORD='!r00t' add_user [ ! -d ${INIT_DIR}/root ] && mkdir ${INIT_DIR}/root diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf index c03579b0..85b638e6 100644 --- a/remote/tools/base/base.conf +++ b/remote/tools/base/base.conf @@ -42,10 +42,6 @@ REQUIRED_DIRECTORIES=" /etc/pam.d /etc/security" REQUIRED_FILES=" /sbin/mount.nfs4 /sbin/umount.nfs4 - /etc/passwd - /etc/shadow - /etc/group - /etc/hostname /etc/environment /etc/pam.conf /etc/issue |