From f891859df30c95312a26e71f996a77cec305ba29 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 28 May 2014 15:56:44 -0700 Subject: [PATCH] fix(sys-apps/systemd): Don't prune systemd dirs (take 2) Commit 591dd523 mistakenly did not apply the same change to the live ebuild. After this the live build includes most things the stable does. --- .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index b6ade5c8ca..b5dc927da1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -340,11 +340,7 @@ multilib_src_install_all() { # Disable storing coredumps in journald, bug #433457 mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die - # Preserve empty dir /var, bug #437008 - keepdir /var/lib/systemd - - # Keep /etc clean - rmdir "${D}"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d || die + systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf # Don't default to graphical.target rm "${D}"/usr/lib/systemd/system/default.target || die