mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-19 05:21:23 +02:00
bump(coreos-base/coreos-init): Update to latest init code, includes c10n
Biggest diff here: coreos-init has a Makefile that supports the usual 'install' and 'test' targets so no file copying is required now. coreos-c10n has moved to init from etcd and has its own service now. This version of init also includes support for automounting virtfs filesystems under qemu for use with an updated version of c10n but for now c10n remains unchanged. Optionally unit tests are available too!
This commit is contained in:
parent
97c7997850
commit
bab545f35b
@ -3,7 +3,7 @@
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="4"
|
||||
CROS_WORKON_COMMIT="38505c2cd170420f0623564794063769a4147aa5"
|
||||
CROS_WORKON_COMMIT="84b679b9525db179a3bf78e9e67ab5553d0cc636"
|
||||
CROS_WORKON_PROJECT="coreos/init"
|
||||
CROS_WORKON_LOCALNAME="init"
|
||||
|
||||
@ -16,13 +16,15 @@ SRC_URI=""
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm x86"
|
||||
IUSE="nfs"
|
||||
IUSE="test"
|
||||
|
||||
# Daemons we enable here must installed during build/install in addition to
|
||||
# during runtime so the systemd unit enable step works.
|
||||
DEPEND="
|
||||
net-misc/dhcpcd
|
||||
net-misc/openssh
|
||||
!<dev-db/etcd-0.0.1-r6
|
||||
test? ( dev-lang/python:2.7 )
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
sys-block/parted
|
||||
@ -31,25 +33,7 @@ RDEPEND="${DEPEND}
|
||||
"
|
||||
|
||||
src_install() {
|
||||
# Install our boot scripts along side systemd in /usr/lib
|
||||
exeinto /usr/lib/coreos
|
||||
for script in scripts/*; do
|
||||
doexe "${script}"
|
||||
done
|
||||
|
||||
# Install our custom ssh config settings.
|
||||
insinto /etc/ssh
|
||||
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
|
||||
default
|
||||
|
||||
# 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
|
||||
@ -57,6 +41,7 @@ src_install() {
|
||||
systemd_enable_service basic.target coreos-startup.target
|
||||
|
||||
# Services!
|
||||
systemd_enable_service default.target coreos-c10n.service
|
||||
systemd_enable_service default.target local-enable.service
|
||||
systemd_enable_service default.target dhcpcd.service
|
||||
systemd_enable_service default.target sshd-keygen.service
|
||||
|
@ -15,13 +15,15 @@ SRC_URI=""
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
IUSE="nfs"
|
||||
IUSE="test"
|
||||
|
||||
# Daemons we enable here must installed during build/install in addition to
|
||||
# during runtime so the systemd unit enable step works.
|
||||
DEPEND="
|
||||
net-misc/dhcpcd
|
||||
net-misc/openssh
|
||||
!<dev-db/etcd-0.0.1-r6
|
||||
test? ( dev-lang/python:2.7 )
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
sys-block/parted
|
||||
@ -30,25 +32,7 @@ RDEPEND="${DEPEND}
|
||||
"
|
||||
|
||||
src_install() {
|
||||
# Install our boot scripts along side systemd in /usr/lib
|
||||
exeinto /usr/lib/coreos
|
||||
for script in scripts/*; do
|
||||
doexe "${script}"
|
||||
done
|
||||
|
||||
# Install our custom ssh config settings.
|
||||
insinto /etc/ssh
|
||||
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
|
||||
default
|
||||
|
||||
# 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
|
||||
@ -56,6 +40,7 @@ src_install() {
|
||||
systemd_enable_service basic.target coreos-startup.target
|
||||
|
||||
# Services!
|
||||
systemd_enable_service default.target coreos-c10n.service
|
||||
systemd_enable_service default.target local-enable.service
|
||||
systemd_enable_service default.target dhcpcd.service
|
||||
systemd_enable_service default.target sshd-keygen.service
|
||||
|
Loading…
x
Reference in New Issue
Block a user