From be726b28fd37bc6f2aa2113c140cecb334294854 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 14 Jul 2014 15:26:16 -0700 Subject: [PATCH] systemd: remove tmpfiles rules nowincluded in systemd No need for resolv.conf or /var/lib/systemd any more. --- .../coreos-overlay/sys-apps/systemd/files/systemd-coreos.conf | 1 - .../coreos-overlay/sys-apps/systemd/files/systemd-resolv.conf | 1 - .../systemd/{systemd-215-r1.ebuild => systemd-215-r2.ebuild} | 1 - .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 1 - 4 files changed, 4 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-resolv.conf rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-215-r1.ebuild => systemd-215-r2.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-coreos.conf b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-coreos.conf index 07cc22308f..b522ff7d49 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-coreos.conf +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-coreos.conf @@ -6,4 +6,3 @@ d /etc/systemd/network - - - - - d /etc/systemd/system - - - - - d /etc/systemd/user - - - - - d /etc/tmpfiles.d - - - - - -d /var/lib/systemd - - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-resolv.conf b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-resolv.conf deleted file mode 100644 index d1944cc78b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-resolv.conf +++ /dev/null @@ -1 +0,0 @@ -L /etc/resolv.conf - - - - /run/systemd/resolve/resolv.conf diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r2.ebuild index 3472d67633..36e3b4ba50 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r2.ebuild @@ -361,7 +361,6 @@ multilib_src_install_all() { mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf - systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf # Don't default to graphical.target rm "${D}"/usr/lib/systemd/system/default.target || die 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 8d1131d20c..41bdc7d1ff 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 @@ -352,7 +352,6 @@ multilib_src_install_all() { mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf - systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf # Don't default to graphical.target rm "${D}"/usr/lib/systemd/system/default.target || die