From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 24611158020 for ; Thu, 8 Dec 2022 21:29:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2AEFE0907; Thu, 8 Dec 2022 21:29:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60EFAE08FF for ; Thu, 8 Dec 2022 21:29:12 +0000 (UTC) From: James Le Cuirot To: gentoo-dev Cc: James Le Cuirot Subject: [gentoo-dev] [PATCH 2/2] acct-user.eclass: Don't modify users when EPREFIX is non-empty Date: Thu, 8 Dec 2022 21:28:54 +0000 Message-Id: <20221208212854.3825-3-chewi@gentoo.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208212854.3825-1-chewi@gentoo.org> References: <20221208212854.3825-1-chewi@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: c07d6098-71fe-456b-ab88-c526f68a31d4 X-Archives-Hash: 1d11085b7d6074abe86e5a6bbb8ae465 This was happening when running a prefix as root, which we don't really support, but also when building a prefixed system under ROOT. Signed-off-by: James Le Cuirot --- eclass/acct-user.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass index b15599c5dd6f..a37e12121f83 100644 --- a/eclass/acct-user.eclass +++ b/eclass/acct-user.eclass @@ -181,7 +181,7 @@ acct-user_add_deps() { eislocked() { [[ $# -eq 1 ]] || die "usage: ${FUNCNAME} " - if [[ ${EUID} -ne 0 ]]; then + if [[ ${EUID} -ne 0 || -n ${EPREFIX} ]]; then einfo "Insufficient privileges to execute ${FUNCNAME[0]}" return 0 fi @@ -332,7 +332,7 @@ acct-user_pkg_preinst() { unset _ACCT_USER_ADDED - if [[ ${EUID} -ne 0 ]]; then + if [[ ${EUID} -ne 0 || -n ${EPREFIX} ]]; then einfo "Insufficient privileges to execute ${FUNCNAME[0]}" return fi @@ -405,7 +405,7 @@ acct-user_pkg_postinst() { return fi - if [[ ${EUID} -ne 0 ]]; then + if [[ ${EUID} -ne 0 || -n ${EPREFIX} ]]; then einfo "Insufficient privileges to execute ${FUNCNAME[0]}" return fi @@ -454,7 +454,7 @@ acct-user_pkg_prerm() { return fi - if [[ ${EUID} -ne 0 ]]; then + if [[ ${EUID} -ne 0 || -n ${EPREFIX} ]]; then einfo "Insufficient privileges to execute ${FUNCNAME[0]}" return fi -- 2.38.1