Merge pull request #615 from marineam/container

init and cloudinit updates
This commit is contained in:
Michael Marineau 2014-05-17 16:15:18 -07:00
commit be5c990634
4 changed files with 4 additions and 3 deletions

View File

@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64" KEYWORDS="~amd64"
else else
CROS_WORKON_COMMIT="a398ce82f75001d23a53a4cf45d90a69b09b0b6e" CROS_WORKON_COMMIT="24f181f7a33fbfa15739164e87f389ace6c4f0da"
KEYWORDS="amd64" KEYWORDS="amd64"
fi fi
@ -37,6 +37,7 @@ src_compile() {
src_install() { src_install() {
dobin ${S}/bin/coreos-cloudinit dobin ${S}/bin/coreos-cloudinit
udev_dorules units/*.rules udev_dorules units/*.rules
systemd_dounit units/*.path
systemd_dounit units/*.service systemd_dounit units/*.service
systemd_dounit units/*.target systemd_dounit units/*.target
systemd_enable_service default.target system-config.target systemd_enable_service default.target system-config.target

View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86" KEYWORDS="~amd64 ~arm ~x86"
else else
CROS_WORKON_COMMIT="f395357a5f28043c9ed8c50bdf6391cad4421552" CROS_WORKON_COMMIT="6fb305954e7aedab085af74aa470d9ad99d2b4d1"
KEYWORDS="amd64 arm x86" KEYWORDS="amd64 arm x86"
fi fi
@ -58,5 +58,5 @@ src_install() {
systemd_enable_service default.target ssh-key-proc-cmdline.service systemd_enable_service default.target ssh-key-proc-cmdline.service
systemd_enable_service sockets.target docker.socket systemd_enable_service sockets.target docker.socket
systemd_enable_service default.target issuegen.service systemd_enable_service default.target issuegen.service
systemd_enable_service default.target motdgen.service systemd_enable_service default.target motdgen.timer
} }