Skip to content

Commit

Permalink
make.globals: Set PORTAGE_USERNAME and PORTAGE_GRPNAME variables
Browse files Browse the repository at this point in the history
"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 <[email protected]>
Closes: #1414
Signed-off-by: Zac Medico <[email protected]>
  • Loading branch information
duxsco authored and zmedico committed Jan 11, 2025
1 parent af80dd3 commit 5a652b1
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions cnf/make.globals
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 5a652b1

Please sign in to comment.