From da254bcd45e3cdb68e34c2bbed4dca57d82250e7 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 28 Jul 2013 22:55:17 -0700 Subject: [PATCH] fix(init): move a few things around 1) Make default.target be multi-user.target instead of the default, graphical.target 2) Move daemons out of coreos-startup and just have them wantedby default.target 3) Have update-engine not rely on coreos-startup and add itself to default.target.wants 4) Grab the new init code that does the above 5) Add the local-enable.service which will add /media/state/units to /run/systemd/system and start local.target --- ....0.1-r11.ebuild => coreos-init-0.0.1-r12.ebuild} | 0 .../coreos-init/coreos-init-0.0.1.ebuild | 13 +++++++++++-- .../coreos-base/coreos-init/coreos-init-9999.ebuild | 11 ++++++++++- .../update_engine/files/update-engine.service | 2 +- ...-r378.ebuild => update_engine-0.0.1-r379.ebuild} | 0 .../update_engine/update_engine-0.0.1.ebuild | 1 + .../update_engine/update_engine-9999.ebuild | 1 + 7 files changed, 24 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r11.ebuild => coreos-init-0.0.1-r12.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.0.1-r378.ebuild => update_engine-0.0.1-r379.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r12.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r11.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r12.ebuild 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 a0e7496dfa..0cb40d500a 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="defdf1c8856372681c6e0be318beec8af7eb36be" +CROS_WORKON_COMMIT="bd43c06a3b0eb14ed6d5f93af2a9dfafe060d8bc" CROS_WORKON_PROJECT="coreos/init" CROS_WORKON_LOCALNAME="init" @@ -51,5 +51,14 @@ src_install() { systemd_dounit "${unit}" done - systemd_enable_service multi-user.target coreos-startup.target + # Set the default target to multi-user not graphical, this is CoreOS! + dosym /usr/lib/systemd/system/multi-user.target /etc/systemd/system/default.target + + systemd_enable_service basic.target coreos-startup.target + + # Services! + systemd_enable_service default.target local-enable.service + systemd_enable_service default.target dhcpcd.service + systemd_enable_service default.target sshd-keygen.service + systemd_enable_service default.target sshd.socket } 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 742aeab6b8..35b24ce8b5 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 @@ -50,5 +50,14 @@ src_install() { systemd_dounit "${unit}" done - systemd_enable_service multi-user.target coreos-startup.target + # Set the default target to multi-user not graphical, this is CoreOS! + dosym /usr/lib/systemd/system/multi-user.target /etc/systemd/system/default.target + + systemd_enable_service basic.target coreos-startup.target + + # Services! + systemd_enable_service default.target local-enable.service + systemd_enable_service default.target dhcpcd.service + systemd_enable_service default.target sshd-keygen.service + systemd_enable_service default.target sshd.socket } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service index cbd23b7efd..21a844dcd4 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service @@ -11,4 +11,4 @@ Restart=always RestartSec=30 [Install] -WantedBy=multi-user.target +WantedBy=default.target diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r378.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r379.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r378.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r379.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild index 05d11e9379..b76aca827d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild @@ -85,6 +85,7 @@ src_install() { use delta_generator && dobin delta_generator systemd_dounit "${FILESDIR}"/update-engine.service + systemd_enable_service multi-user.target update-engine.service insinto /usr/share/dbus-1/services doins org.chromium.UpdateEngine.service diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index 85e96ae2b9..8ed2171b58 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -84,6 +84,7 @@ src_install() { use delta_generator && dobin delta_generator systemd_dounit "${FILESDIR}"/update-engine.service + systemd_enable_service multi-user.target update-engine.service insinto /usr/share/dbus-1/services doins org.chromium.UpdateEngine.service