| 1 |
commit: 3d16edacf664782db004255b67464808c257f722 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 5 18:39:11 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 9 18:02:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d16edac |
| 7 |
|
| 8 |
acct-group.eclass: Support ACCT_GROUP_ID override |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/acct-group.eclass | 39 +++++++++++++++++++++++++++++---------- |
| 13 |
1 file changed, 29 insertions(+), 10 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass |
| 16 |
index 9c46d3a1c21..11a9f29e625 100644 |
| 17 |
--- a/eclass/acct-group.eclass |
| 18 |
+++ b/eclass/acct-group.eclass |
| 19 |
@@ -59,7 +59,8 @@ readonly ACCT_GROUP_NAME |
| 20 |
# @REQUIRED |
| 21 |
# @DESCRIPTION: |
| 22 |
# Preferred GID for the new group. This variable is obligatory, and its |
| 23 |
-# value must be unique across all group packages. |
| 24 |
+# value must be unique across all group packages. This can be overriden |
| 25 |
+# in make.conf through ACCT_GROUP_<UPPERCASE_USERNAME>_ID variable. |
| 26 |
# |
| 27 |
# Overlays should set this to -1 to dynamically allocate GID. Using -1 |
| 28 |
# in ::gentoo is prohibited by policy. |
| 29 |
@@ -91,25 +92,33 @@ acct-group_pkg_pretend() { |
| 30 |
|
| 31 |
# verify ACCT_GROUP_ID |
| 32 |
[[ -n ${ACCT_GROUP_ID} ]] || die "Ebuild error: ACCT_GROUP_ID must be set!" |
| 33 |
- [[ ${ACCT_GROUP_ID} -eq -1 ]] && return |
| 34 |
- [[ ${ACCT_GROUP_ID} -ge 0 ]] || die "Ebuild errors: ACCT_GROUP_ID=${ACCT_GROUP_ID} invalid!" |
| 35 |
+ [[ ${ACCT_GROUP_ID} -ge -1 ]] || die "Ebuild error: ACCT_GROUP_ID=${ACCT_GROUP_ID} invalid!" |
| 36 |
+ local group_id=${ACCT_GROUP_ID} |
| 37 |
+ |
| 38 |
+ # check for the override |
| 39 |
+ local override_name=${ACCT_GROUP_NAME^^} |
| 40 |
+ local override_var=ACCT_GROUP_${override_name//-/_}_ID |
| 41 |
+ if [[ -n ${!override_var} ]]; then |
| 42 |
+ group_id=${!override_var} |
| 43 |
+ [[ ${group_id} -ge -1 ]] || die "${override_var}=${group_id} invalid!" |
| 44 |
+ fi |
| 45 |
|
| 46 |
# check for ACCT_GROUP_ID collisions early |
| 47 |
- if [[ -n ${ACCT_GROUP_ENFORCE_ID} ]]; then |
| 48 |
- local group_by_id=$(egetgroupname "${ACCT_GROUP_ID}") |
| 49 |
+ if [[ ${group_id} -ne -1 && -n ${ACCT_GROUP_ENFORCE_ID} ]]; then |
| 50 |
+ local group_by_id=$(egetgroupname "${group_id}") |
| 51 |
local group_by_name=$(egetent group "${ACCT_GROUP_NAME}") |
| 52 |
if [[ -n ${group_by_id} ]]; then |
| 53 |
if [[ ${group_by_id} != ${ACCT_GROUP_NAME} ]]; then |
| 54 |
eerror "The required GID is already taken by another group." |
| 55 |
- eerror " GID: ${ACCT_GROUP_ID}" |
| 56 |
+ eerror " GID: ${group_id}" |
| 57 |
eerror " needed for: ${ACCT_GROUP_NAME}" |
| 58 |
eerror " current group: ${group_by_id}" |
| 59 |
- die "GID ${ACCT_GROUP_ID} taken already" |
| 60 |
+ die "GID ${group_id} taken already" |
| 61 |
fi |
| 62 |
elif [[ -n ${group_by_name} ]]; then |
| 63 |
eerror "The requested group exists already with wrong GID." |
| 64 |
eerror " groupname: ${ACCT_GROUP_NAME}" |
| 65 |
- eerror " requested GID: ${ACCT_GROUP_ID}" |
| 66 |
+ eerror " requested GID: ${group_id}" |
| 67 |
eerror " current entry: ${group_by_name}" |
| 68 |
die "Group ${ACCT_GROUP_NAME} exists with wrong GID" |
| 69 |
fi |
| 70 |
@@ -122,11 +131,21 @@ acct-group_pkg_pretend() { |
| 71 |
acct-group_src_install() { |
| 72 |
debug-print-function ${FUNCNAME} "${@}" |
| 73 |
|
| 74 |
+ # check for the override |
| 75 |
+ local override_name=${ACCT_GROUP_NAME^^} |
| 76 |
+ local override_var=ACCT_GROUP_${override_name//-/_}_ID |
| 77 |
+ if [[ -n ${!override_var} ]]; then |
| 78 |
+ ewarn "${override_var}=${!override_var} override in effect, support will not be provided." |
| 79 |
+ _ACCT_GROUP_ID=${!override_var} |
| 80 |
+ else |
| 81 |
+ _ACCT_GROUP_ID=${ACCT_GROUP_ID} |
| 82 |
+ fi |
| 83 |
+ |
| 84 |
insinto /usr/lib/sysusers.d |
| 85 |
newins - ${CATEGORY}-${ACCT_GROUP_NAME}.conf < <( |
| 86 |
printf "g\t%q\t%q\n" \ |
| 87 |
"${ACCT_GROUP_NAME}" \ |
| 88 |
- "${ACCT_GROUP_ID/#-*/-}" |
| 89 |
+ "${_ACCT_GROUP_ID/#-*/-}" |
| 90 |
) |
| 91 |
} |
| 92 |
|
| 93 |
@@ -137,7 +156,7 @@ acct-group_pkg_preinst() { |
| 94 |
debug-print-function ${FUNCNAME} "${@}" |
| 95 |
|
| 96 |
enewgroup ${ACCT_GROUP_ENFORCE_ID:+-F} "${ACCT_GROUP_NAME}" \ |
| 97 |
- "${ACCT_GROUP_ID}" |
| 98 |
+ "${_ACCT_GROUP_ID}" |
| 99 |
} |
| 100 |
|
| 101 |
fi |
Archives