From feb372fdb497f506ad7eb03f41c193efe530491c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 6 Jun 2013 16:37:49 -0400 Subject: [PATCH] bump(coreos-base/coreos-init): New code Adds tmpfiles config, more units, and top level coreos-startup.target which eliminates the need for maintaining that list in the ebuild. --- .../coreos-base/coreos-init/coreos-init-0.0.1.ebuild | 12 ++++++------ .../coreos-base/coreos-init/coreos-init-9999.ebuild | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild index a9f8920b7c..9f29f42f48 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="c66322975a726f06036070c78883995612f3dfa0" +CROS_WORKON_COMMIT="723ce96cfbc156f665a9dde63567ea4f427da9da" CROS_WORKON_PROJECT="coreos/init" CROS_WORKON_LOCALNAME="init" @@ -42,14 +42,14 @@ src_install() { doins configs/ssh{,d}_config fperms 600 /etc/ssh/sshd_config + # List of directories that should be recreated as needed + insinto /usr/lib/tmpfiles.d + newins configs/tmpfiles.conf zz-${PN}.conf + # Install all units, enable the higher-level services for unit in systemd/*; do systemd_dounit "${unit}" done - systemd_enable_service basic.target coreos-startup.service - systemd_enable_service multi-user.target dhcpcd.service - systemd_enable_service multi-user.target sshd.socket - systemd_enable_service multi-user.target update-engine.service - systemd_enable_service sshd.socket sshd-keygen.service + systemd_enable_service multi-user.target coreos-startup.target } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 9e5b4c2e53..742aeab6b8 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -41,14 +41,14 @@ src_install() { doins configs/ssh{,d}_config fperms 600 /etc/ssh/sshd_config + # List of directories that should be recreated as needed + insinto /usr/lib/tmpfiles.d + newins configs/tmpfiles.conf zz-${PN}.conf + # Install all units, enable the higher-level services for unit in systemd/*; do systemd_dounit "${unit}" done - systemd_enable_service basic.target coreos-startup.service - systemd_enable_service multi-user.target dhcpcd.service - systemd_enable_service multi-user.target sshd.socket - systemd_enable_service multi-user.target update-engine.service - systemd_enable_service sshd.socket sshd-keygen.service + systemd_enable_service multi-user.target coreos-startup.target }