mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 01:46:58 +02:00
bump(coreos-base/coreos-init): Replaces oem-services in a generic way.
coreos-detect-virt has moved from oem-service and the oem-service unit has been replaced by new units that work for both oem and virtfs mounts.
This commit is contained in:
parent
bab545f35b
commit
d6203b64c1
@ -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="84b679b9525db179a3bf78e9e67ab5553d0cc636"
|
CROS_WORKON_COMMIT="4146847b48b7d692f6b8ce50be07c886e7a85fc9"
|
||||||
CROS_WORKON_PROJECT="coreos/init"
|
CROS_WORKON_PROJECT="coreos/init"
|
||||||
CROS_WORKON_LOCALNAME="init"
|
CROS_WORKON_LOCALNAME="init"
|
||||||
|
|
||||||
@ -24,6 +24,7 @@ DEPEND="
|
|||||||
net-misc/dhcpcd
|
net-misc/dhcpcd
|
||||||
net-misc/openssh
|
net-misc/openssh
|
||||||
!<dev-db/etcd-0.0.1-r6
|
!<dev-db/etcd-0.0.1-r6
|
||||||
|
!coreos-base/oem-service
|
||||||
test? ( dev-lang/python:2.7 )
|
test? ( dev-lang/python:2.7 )
|
||||||
"
|
"
|
||||||
RDEPEND="${DEPEND}
|
RDEPEND="${DEPEND}
|
||||||
|
@ -23,6 +23,7 @@ DEPEND="
|
|||||||
net-misc/dhcpcd
|
net-misc/dhcpcd
|
||||||
net-misc/openssh
|
net-misc/openssh
|
||||||
!<dev-db/etcd-0.0.1-r6
|
!<dev-db/etcd-0.0.1-r6
|
||||||
|
!coreos-base/oem-service
|
||||||
test? ( dev-lang/python:2.7 )
|
test? ( dev-lang/python:2.7 )
|
||||||
"
|
"
|
||||||
RDEPEND="${DEPEND}
|
RDEPEND="${DEPEND}
|
||||||
|
@ -149,7 +149,6 @@ RDEPEND="${RDEPEND}
|
|||||||
app-emulation/docker
|
app-emulation/docker
|
||||||
app-misc/ca-certificates
|
app-misc/ca-certificates
|
||||||
virtual/udev
|
virtual/udev
|
||||||
coreos-base/oem-service
|
|
||||||
dev-db/etcd
|
dev-db/etcd
|
||||||
"
|
"
|
||||||
|
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
OEM_RELEASE="/usr/share/oem/oem-release"
|
|
||||||
|
|
||||||
VIRT=
|
|
||||||
|
|
||||||
if [ -e "${OEM_RELEASE}" ]; then
|
|
||||||
VIRT=$(cat ${OEM_RELEASE})
|
|
||||||
else
|
|
||||||
VIRT=$(systemd-detect-virt)
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo $VIRT
|
|
@ -1,6 +0,0 @@
|
|||||||
[Service]
|
|
||||||
Type=oneshot
|
|
||||||
ExecStart=/usr/bin/run-oem.sh
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
@ -1,6 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Each oem implemenation has a run.sh that boostraps its OEM process for systemd
|
|
||||||
OEM_EXEC="/usr/share/oem/run.sh"
|
|
||||||
|
|
||||||
[ -e $OEM_EXEC ] && exec $OEM_EXEC || exit 0
|
|
@ -1 +0,0 @@
|
|||||||
oem-service-0.0.1.ebuild
|
|
@ -1,26 +0,0 @@
|
|||||||
#
|
|
||||||
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
|
|
||||||
# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header:$
|
|
||||||
#
|
|
||||||
|
|
||||||
EAPI=2
|
|
||||||
inherit systemd
|
|
||||||
|
|
||||||
DESCRIPTION="oem service"
|
|
||||||
HOMEPAGE=""
|
|
||||||
SRC_URI=""
|
|
||||||
|
|
||||||
LICENSE="Apache-2.0"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
dobin ${FILESDIR}/run-oem.sh
|
|
||||||
dobin ${FILESDIR}/coreos-detect-virt
|
|
||||||
|
|
||||||
systemd_dounit "${FILESDIR}"/${PN}.service
|
|
||||||
systemd_enable_service multi-user.target ${PN}.service
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user