summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2019-07-10 15:06:03 -0400
committerMike Gilbert <floppym@gentoo.org>2019-07-10 15:18:20 -0400
commit2d3ac449e2125b58ca0d946ad21b8173054b446e (patch)
treeabb15e3d25a4452f7a57f29660fa8f348e82f90c
parentsys-apps/systemd: drop systemd-bus-proxy user/group (diff)
downloadgentoo-2d3ac449e2125b58ca0d946ad21b8173054b446e.tar.gz
gentoo-2d3ac449e2125b58ca0d946ad21b8173054b446e.tar.bz2
gentoo-2d3ac449e2125b58ca0d946ad21b8173054b446e.zip
sys-apps/systemd: update keepdir list
Closes: https://bugs.gentoo.org/678758 Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r--sys-apps/systemd/systemd-242-r6.ebuild9
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild9
2 files changed, 14 insertions, 4 deletions
diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild
index e6f4be93ba1e..15408cfe976a 100644
--- a/sys-apps/systemd/systemd-242-r6.ebuild
+++ b/sys-apps/systemd/systemd-242-r6.ebuild
@@ -343,9 +343,14 @@ multilib_src_install_all() {
# Preserve empty dirs in /etc & /var, bug #437008
keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
- keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+ keepdir /etc/kernel/install.d
+ keepdir /etc/systemd/{network,user}
keepdir /etc/udev/{hwdb.d,rules.d}
- keepdir /var/log/journal/remote
+ keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+ keepdir /usr/lib/{binfmt.d,modules-load.d}
+ keepdir /usr/lib/systemd/user-generators
+ keepdir /var/lib/systemd
+ rm -rf "${ED}"/var/log || die
# Symlink /etc/sysctl.conf for easy migration.
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7c9a8cf91165..7769725c2c29 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -336,9 +336,14 @@ multilib_src_install_all() {
# Preserve empty dirs in /etc & /var, bug #437008
keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
- keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+ keepdir /etc/kernel/install.d
+ keepdir /etc/systemd/{network,user}
keepdir /etc/udev/{hwdb.d,rules.d}
- keepdir /var/log/journal/remote
+ keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+ keepdir /usr/lib/{binfmt.d,modules-load.d}
+ keepdir /usr/lib/systemd/user-generators
+ keepdir /var/lib/systemd
+ rm -rf "${ED}"/var/log || die
# Symlink /etc/sysctl.conf for easy migration.
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf