diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-07-10 23:40:16 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-07-10 23:40:16 +0100 |
| commit | 51af5f0eb4cddbe6aa7953717873691d77aae9ff (patch) | |
| tree | 1541525274162b033ebbc3ed38abaf335fbbd49a /eclass/acct-user.eclass | |
| parent | 7014a5a3ea0feffab9701fdd6b64cc7667a985af (diff) | |
gentoo resync : 11.07.2019
Diffstat (limited to 'eclass/acct-user.eclass')
| -rw-r--r-- | eclass/acct-user.eclass | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass index 1b8a0bf94a62..60009643c144 100644 --- a/eclass/acct-user.eclass +++ b/eclass/acct-user.eclass @@ -109,7 +109,6 @@ readonly ACCT_USER_NAME # << Boilerplate ebuild variables >> : ${DESCRIPTION:="System user: ${ACCT_USER_NAME}"} -: ${HOMEPAGE:=https://www.gentoo.org/} : ${SLOT:=0} : ${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris} S=${WORKDIR} @@ -326,8 +325,9 @@ acct-user_pkg_preinst() { debug-print-function ${FUNCNAME} "${@}" local groups=${ACCT_USER_GROUPS[*]} - enewuser -F -M "${ACCT_USER_NAME}" "${ACCT_USER_ID}" \ - "${ACCT_USER_SHELL}" "${ACCT_USER_HOME}" "${groups// /,}" + enewuser ${ACCT_USER_ENFORCE_ID:+-F} -M "${ACCT_USER_NAME}" \ + "${ACCT_USER_ID}" "${ACCT_USER_SHELL}" "${ACCT_USER_HOME}" \ + "${groups// /,}" if [[ ${ACCT_USER_HOME} != /dev/null ]]; then # default ownership to user:group @@ -363,6 +363,12 @@ acct-user_pkg_prerm() { debug-print-function ${FUNCNAME} "${@}" if [[ -z ${REPLACED_BY_VERSION} ]]; then + if [[ -z $(egetent passwd "${ACCT_USER_NAME}") ]]; then + ewarn "User account not found: ${ACCT_USER_NAME}" + ewarn "Locking process will be skipped." + return + fi + esetshell "${ACCT_USER_NAME}" -1 esetcomment "${ACCT_USER_NAME}" \ "$(egetcomment "${ACCT_USER_NAME}"); user account removed @ $(date +%Y-%m-%d)" |