Merge pull request #454 from polvi/c10n-igore-failure

fix(c10n): fix with ignore-failures, bump cloudinit ebuild
This commit is contained in:
polvi 2014-03-18 21:28:55 -07:00
commit edb16f0b50
3 changed files with 2 additions and 2 deletions

View File

@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64"
else
CROS_WORKON_COMMIT="06cf75b6607b244c15c85ef13c2f9c8c20bcbbe0" # v0.1.2+git
CROS_WORKON_COMMIT="c2faaa503b3dfbaa58960db36bdc77a9c7b02ce2" # v0.1.2+git
KEYWORDS="amd64"
fi

View File

@ -24,7 +24,7 @@ coreos:
[Service]
Type=oneshot
EnvironmentFile=/etc/environment
ExecStart=/usr/bin/coreos-cloudinit -from-url=http://169.254.169.254/latest/user-data
ExecStart=/usr/bin/coreos-cloudinit -ignore-failure=true -from-url=http://169.254.169.254/latest/user-data
- name: ec2-c10n.service
runtime: yes
content: |