1 |
commit: 8fcbeac51966b91f9695093e654f0c76055fa635 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 29 00:10:05 2023 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 29 00:10:05 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcbeac5 |
7 |
|
8 |
sys-apps/baselayout: handle /etc/gentoo-release with CONFIG_PROTECT_MASK |
9 |
|
10 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
11 |
|
12 |
sys-apps/baselayout/baselayout-2.13-r1.ebuild | 11 ----------- |
13 |
1 file changed, 11 deletions(-) |
14 |
|
15 |
diff --git a/sys-apps/baselayout/baselayout-2.13-r1.ebuild b/sys-apps/baselayout/baselayout-2.13-r1.ebuild |
16 |
index afc0043d403a..64d8126ed757 100644 |
17 |
--- a/sys-apps/baselayout/baselayout-2.13-r1.ebuild |
18 |
+++ b/sys-apps/baselayout/baselayout-2.13-r1.ebuild |
19 |
@@ -192,11 +192,6 @@ multilib_layout() { |
20 |
} |
21 |
|
22 |
pkg_preinst() { |
23 |
- # This is written in src_install (so it's in CONTENTS), but punt all |
24 |
- # pending updates to avoid user having to do etc-update (and make the |
25 |
- # pkg_postinst logic simpler). |
26 |
- rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die |
27 |
- |
28 |
# We need to install directories and maybe some dev nodes when building |
29 |
# stages, but they cannot be in CONTENTS. |
30 |
# Also, we cannot reference $S as binpkg will break so we do this. |
31 |
@@ -316,12 +311,6 @@ pkg_postinst() { |
32 |
chmod o-rwx "${EROOT}/etc/${x}" || die |
33 |
fi |
34 |
done |
35 |
- |
36 |
- # Take care of the etc-update for the user |
37 |
- if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then |
38 |
- mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die |
39 |
- fi |
40 |
- |
41 |
# whine about users that lack passwords #193541 |
42 |
if [[ -e "${EROOT}"/etc/shadow ]] ; then |
43 |
local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow) |