mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-20 05:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.1.2-r4.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.1.2-r5.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild vendored
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="06cf75b6607b244c15c85ef13c2f9c8c20bcbbe0" # v0.1.2+git CROS_WORKON_COMMIT="c2faaa503b3dfbaa58960db36bdc77a9c7b02ce2" # v0.1.2+git
KEYWORDS="amd64" KEYWORDS="amd64"
fi fi

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml vendored
View File

@ -24,7 +24,7 @@ coreos:
[Service] [Service]
Type=oneshot Type=oneshot
EnvironmentFile=/etc/environment 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 - name: ec2-c10n.service
runtime: yes runtime: yes
content: | content: |