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-group.eclass | |
| parent | 7014a5a3ea0feffab9701fdd6b64cc7667a985af (diff) | |
gentoo resync : 11.07.2019
Diffstat (limited to 'eclass/acct-group.eclass')
| -rw-r--r-- | eclass/acct-group.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass index 7fe9f19effc7..9eab00db690f 100644 --- a/eclass/acct-group.eclass +++ b/eclass/acct-group.eclass @@ -70,7 +70,6 @@ readonly ACCT_GROUP_NAME # << Boilerplate ebuild variables >> : ${DESCRIPTION:="System group: ${ACCT_GROUP_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} @@ -105,7 +104,7 @@ acct-group_pkg_pretend() { elif [[ -n ${group_by_name} ]]; then eerror "The requested group exists already with wrong GID." eerror " groupname: ${ACCT_GROUP_NAME}" - eerror " requested UID: ${ACCT_GROUP_ID}" + eerror " requested GID: ${ACCT_GROUP_ID}" eerror " current entry: ${group_by_name}" die "Group ${ACCT_GROUP_NAME} exists with wrong GID" fi @@ -118,7 +117,8 @@ acct-group_pkg_pretend() { acct-group_pkg_preinst() { debug-print-function ${FUNCNAME} "${@}" - enewgroup -F "${ACCT_GROUP_NAME}" "${ACCT_GROUP_ID}" + enewgroup ${ACCT_GROUP_ENFORCE_ID:+-F} "${ACCT_GROUP_NAME}" \ + "${ACCT_GROUP_ID}" } fi |