mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-16 09:26:58 +02:00
fix(coreos-init): start splitting startup into multiple units
This is the first round of splitting up the coreos_startup script into multiple units, starting with using systemd to mount the state and oem partitions. This lets us use systemd to get device dependencies right. Also cleanup whitespace, I forgot ebuild style requires tab characters. Sync up -9999 version which I missed in previous commits.
This commit is contained in:
parent
5889dcf1f6
commit
16ce227d79
@ -3,7 +3,7 @@
|
|||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI="4"
|
EAPI="4"
|
||||||
CROS_WORKON_COMMIT="9b03ebb14f931b132963088a11dd41d7425e7b2f"
|
CROS_WORKON_COMMIT="0935d44747e8b336a2e85db02adb589bb75d399e"
|
||||||
CROS_WORKON_PROJECT="coreos/init"
|
CROS_WORKON_PROJECT="coreos/init"
|
||||||
CROS_WORKON_LOCALNAME="init"
|
CROS_WORKON_LOCALNAME="init"
|
||||||
|
|
||||||
@ -20,21 +20,24 @@ IUSE="nfs"
|
|||||||
|
|
||||||
DEPEND=""
|
DEPEND=""
|
||||||
RDEPEND="
|
RDEPEND="
|
||||||
sys-block/parted
|
sys-block/parted
|
||||||
sys-apps/gptfdisk
|
sys-apps/gptfdisk
|
||||||
sys-apps/systemd
|
sys-apps/systemd
|
||||||
"
|
"
|
||||||
|
|
||||||
src_install() {
|
src_install() {
|
||||||
into / # We want /sbin, not /usr/sbin, etc.
|
# Install our boot scripts along side systemd in /usr/lib
|
||||||
|
exeinto /usr/lib/coreos
|
||||||
|
for script in scripts/*; do
|
||||||
|
doexe "${script}"
|
||||||
|
done
|
||||||
|
|
||||||
dosbin coreos_startup
|
# Install all units, enable the higher-level services
|
||||||
|
for unit in systemd/*; do
|
||||||
|
systemd_dounit "${unit}"
|
||||||
|
done
|
||||||
|
|
||||||
systemd_dounit coreos-startup.service
|
|
||||||
systemd_enable_service basic.target coreos-startup.service
|
systemd_enable_service basic.target coreos-startup.service
|
||||||
|
|
||||||
systemd_dounit update-engine.service
|
|
||||||
systemd_enable_service multi-user.target update-engine.service
|
systemd_enable_service multi-user.target update-engine.service
|
||||||
|
|
||||||
systemd_enable_service multi-user.target sshd.socket
|
systemd_enable_service multi-user.target sshd.socket
|
||||||
}
|
}
|
||||||
|
@ -18,18 +18,25 @@ KEYWORDS="~amd64 ~arm ~x86"
|
|||||||
IUSE="nfs"
|
IUSE="nfs"
|
||||||
|
|
||||||
DEPEND=""
|
DEPEND=""
|
||||||
RDEPEND="sys-apps/systemd"
|
RDEPEND="
|
||||||
|
sys-block/parted
|
||||||
|
sys-apps/gptfdisk
|
||||||
|
sys-apps/systemd
|
||||||
|
"
|
||||||
|
|
||||||
src_install() {
|
src_install() {
|
||||||
into / # We want /sbin, not /usr/sbin, etc.
|
# Install our boot scripts along side systemd in /usr/lib
|
||||||
|
exeinto /usr/lib/coreos
|
||||||
|
for script in scripts/*; do
|
||||||
|
doexe "${script}"
|
||||||
|
done
|
||||||
|
|
||||||
dosbin coreos_startup
|
# Install all units, enable the higher-level services
|
||||||
|
for unit in systemd/*; do
|
||||||
|
systemd_dounit "${unit}"
|
||||||
|
done
|
||||||
|
|
||||||
systemd_dounit coreos-startup.service
|
|
||||||
systemd_enable_service basic.target coreos-startup.service
|
systemd_enable_service basic.target coreos-startup.service
|
||||||
|
|
||||||
systemd_dounit update-engine.service
|
|
||||||
systemd_enable_service multi-user.target update-engine.service
|
systemd_enable_service multi-user.target update-engine.service
|
||||||
|
|
||||||
systemd_enable_service multi-user.target sshd.socket
|
systemd_enable_service multi-user.target sshd.socket
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user