diff options
| author |   David Sardari <2036275+duxsco@users.noreply.github.com> | 2025-01-11 14:45:40 +0100 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2025-01-11 10:55:30 -0800 |
| commit | 5a652b1289830ccb0eb138ef0844a312d9531e0a (patch) | |
| tree | ce7f65cdd28d3f8443f8a3a736ba7203e761142a /cnf | |
| parent | portage.VERSION: use subprocess.run() to call git (diff) | |
| download | portage-5a652b1289830ccb0eb138ef0844a312d9531e0a.tar.gz portage-5a652b1289830ccb0eb138ef0844a312d9531e0a.tar.bz2 portage-5a652b1289830ccb0eb138ef0844a312d9531e0a.zip | |
make.globals: Set PORTAGE_USERNAME and PORTAGE_GRPNAME variables
"man 5 make.conf" states that "PORTAGE_USERNAME" and "PORTAGE_GRPNAME" default to "portage":
- https://github.com/gentoo/portage/blob/597229aff02810764223a4cdd1e8056142d70ed0/man/make.conf.5#L1257-L1261
- https://github.com/gentoo/portage/blob/597229aff02810764223a4cdd1e8056142d70ed0/man/make.conf.5#L1109-L1113
But, the two variables are not set in the files pointed out by "man 5 make.conf":
https://github.com/gentoo/portage/blob/597229aff02810764223a4cdd1e8056142d70ed0/man/make.conf.5#L21-L31
This commits solves the discrepancy.
Bug: https://bugs.gentoo.org/941977
Signed-off-by: David Sardari <d@duxsco.de>
Closes: https://github.com/gentoo/portage/pull/1414
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'cnf')
| -rw-r--r-- | cnf/make.globals | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cnf/make.globals b/cnf/make.globals index 94eac6568..9f5a19c18 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -55,6 +55,10 @@ BINPKG_GPG_VERIFY_BASE_COMMAND="/usr/bin/gpg --verify --batch --no-tty --no-auto # The binary package default GPG home directory for verify BINPKG_GPG_VERIFY_GPG_HOME="/etc/portage/gnupg" +# The user and group will be used when drop root privileges +PORTAGE_USERNAME="portage" +PORTAGE_GRPNAME="portage" + # The user and group will be used when drop root privileges during GPG verify GPG_VERIFY_USER_DROP="nobody" GPG_VERIFY_GROUP_DROP="nogroup" |