summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2020-12-27 14:13:42 -0500
committerMike Gilbert <floppym@gentoo.org>2020-12-27 14:19:26 -0500
commit111e1527e7be452a15e0b02dea401c87ed937264 (patch)
tree746ebc9ca34847abde4986d2908fb47095d32f9a /sys-apps/systemd
parentsys-apps/systemd: depend on acct-user/systemd-oom (diff)
downloadgentoo-111e1527e7be452a15e0b02dea401c87ed937264.tar.gz
gentoo-111e1527e7be452a15e0b02dea401c87ed937264.tar.bz2
gentoo-111e1527e7be452a15e0b02dea401c87ed937264.zip
sys-apps/systemd: drop sysusers.d files
These conflict with the files generated by the acct-* packages. Bug: https://bugs.gentoo.org/761763 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r--sys-apps/systemd/systemd-247.2-r2.ebuild (renamed from sys-apps/systemd/systemd-247.2-r1.ebuild)3
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild3
2 files changed, 6 insertions, 0 deletions
diff --git a/sys-apps/systemd/systemd-247.2-r1.ebuild b/sys-apps/systemd/systemd-247.2-r2.ebuild
index 3d84b39bc76..d657bb688fa 100644
--- a/sys-apps/systemd/systemd-247.2-r1.ebuild
+++ b/sys-apps/systemd/systemd-247.2-r2.ebuild
@@ -371,6 +371,9 @@ multilib_src_install_all() {
rmdir "${ED}${rootprefix}"/sbin || die
fi
+ # https://bugs.gentoo.org/761763
+ rm -r "${ED}"/usr/lib/sysusers.d || die
+
# Preserve empty dirs in /etc & /var, bug #437008
keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
keepdir /etc/kernel/install.d
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 3d84b39bc76..d657bb688fa 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -371,6 +371,9 @@ multilib_src_install_all() {
rmdir "${ED}${rootprefix}"/sbin || die
fi
+ # https://bugs.gentoo.org/761763
+ rm -r "${ED}"/usr/lib/sysusers.d || die
+
# Preserve empty dirs in /etc & /var, bug #437008
keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
keepdir /etc/kernel/install.d