Gentoo Archives: gentoo-dev

From: heroxbd@g.o
To: gentoo-dev@l.g.o
Cc: Benda Xu <heroxbd@g.o>
Subject: [gentoo-dev] [PATCH] eclass/acct-user.eclass: disable fcaps() on Prefix.
Date: Sun, 08 Mar 2020 04:21:10
Message-Id: 20200308042047.47176-1-heroxbd@gentoo.org
From: Benda Xu <heroxbd@g.o>

  Gentoo Prefix runs with a normal user and cannot grant extra
  capabilities.  Exit gracefully with a message.

Closes: https://bugs.gentoo.org/699526
Signed-off-by: Benda Xu <heroxbd@g.o>
---
 eclass/fcaps.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 467f955f5e9a..563d177c92d5 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -78,6 +78,11 @@ DEPEND="filecaps? ( sys-libs/libcap )"
 fcaps() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if [[ ${EUID} != 0 ]] ; then
+		einfo "Insufficient privileges to execute ${FUNCNAME[0]}"
+		return 0
+	fi
+
 	# Process the user options first.
 	local owner='root'
 	local group='0'
-- 
2.25.0

Replies