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
This commit is contained in:
Brandon Philips 2013-07-28 22:55:17 -07:00
parent 113b6e6282
commit da254bcd45
7 changed files with 24 additions and 4 deletions

View File

@ -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
}

View File

@ -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
}

View File

@ -11,4 +11,4 @@ Restart=always
RestartSec=30
[Install]
WantedBy=multi-user.target
WantedBy=default.target

View File

@ -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

View File

@ -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