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