Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:prefix commit in: bin/
Date: Thu, 06 Dec 2018 12:46:25
Message-Id: 1544100338.73c1fbe000df372ca1c6eed750ede06216b9b774.grobian@gentoo
1 commit: 73c1fbe000df372ca1c6eed750ede06216b9b774
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 6 12:45:38 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 6 12:45:38 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=73c1fbe0
7
8 bin/etc-update: ensure we ignore the host for Prefix
9
10 Bug: https://bugs.gentoo.org/669290
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12
13 bin/etc-update | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16 diff --git a/bin/etc-update b/bin/etc-update
17 index 4208b9f2b..d75388bba 100755
18 --- a/bin/etc-update
19 +++ b/bin/etc-update
20 @@ -32,7 +32,7 @@ get_config() {
21 "${PORTAGE_CONFIGROOT}"etc/etc-update.conf)
22 }
23
24 -OS_RELEASE_ID=$(cat /etc/os-release 2>/dev/null | grep '^ID=' | cut -d'=' -f2 | sed -e 's/"//g')
25 +OS_RELEASE_ID=$(cat "@PORTAGE_EPREFIX@"/etc/os-release 2>/dev/null | grep '^ID=' | cut -d'=' -f2 | sed -e 's/"//g')
26
27 case $OS_RELEASE_ID in
28 suse|opensuse|opensuse-leap|opensuse-tumbleweed) OS_FAMILY='rpm' ;;