Gentoo Archives: gentoo-dev

From: James Le Cuirot <chewi@g.o>
To: gentoo-dev <gentoo-dev@l.g.o>
Cc: James Le Cuirot <chewi@g.o>
Subject: [gentoo-dev] [PATCH 2/4] acct-user.eclass: Fix for when building in a rooted prefix (EROOT)
Date: Tue, 06 Dec 2022 22:24:51
Message-Id: 20221206222414.13633-2-chewi@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/4] acct-group.eclass: Fix for when building in a rooted prefix (EROOT) by James Le Cuirot
1 Users are largely irrelevant for prefix, but we still don't want the
2 build to break.
3
4 Signed-off-by: James Le Cuirot <chewi@g.o>
5 ---
6 eclass/acct-user.eclass | 8 ++++----
7 1 file changed, 4 insertions(+), 4 deletions(-)
8
9 diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
10 index b15599c5dd6f..538cc6ae8ec3 100644
11 --- a/eclass/acct-user.eclass
12 +++ b/eclass/acct-user.eclass
13 @@ -200,7 +200,7 @@ eislocked() {
14 # but we also expire the account which is more clear
15 local shadow
16 if [[ -n "${ROOT}" ]]; then
17 - shadow=$(grep "^$1:" "${ROOT}/etc/shadow")
18 + shadow=$(grep "^$1:" "${EROOT}/etc/shadow")
19 else
20 shadow=$(getent shadow "$1")
21 fi
22 @@ -362,7 +362,7 @@ acct-user_pkg_preinst() {
23 fi
24
25 if [[ -n ${ROOT} ]]; then
26 - opts+=( --prefix "${ROOT}" )
27 + opts+=( --prefix "${EROOT}" )
28 fi
29
30 elog "Adding user ${ACCT_USER_NAME}"
31 @@ -431,7 +431,7 @@ acct-user_pkg_postinst() {
32 fi
33
34 if [[ -n ${ROOT} ]]; then
35 - opts+=( --prefix "${ROOT}" )
36 + opts+=( --prefix "${EROOT}" )
37 fi
38
39 elog "Updating user ${ACCT_USER_NAME}"
40 @@ -483,7 +483,7 @@ acct-user_pkg_prerm() {
41 )
42
43 if [[ -n ${ROOT} ]]; then
44 - opts+=( --prefix "${ROOT}" )
45 + opts+=( --prefix "${EROOT}" )
46 fi
47
48 elog "Locking user ${ACCT_USER_NAME}"
49 --
50 2.38.1