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

Merge pull request #484 from bcwaldon/fix-path-unit

Browse Source 
Fix oem-vagrant cloudinit
This commit is contained in:
Brian Waldon 2014-03-25 20:28:12 -07:00
commit 0bd1f545e6
3 changed files with 5 additions and 1 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.3.0.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.1.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="e68134d88480595211ea594b10be3316f19085b5" # v0.3.0 CROS_WORKON_COMMIT="4977c774d81d1326e0099692afc87fa002c003ad" # v0.3.1
KEYWORDS="amd64" KEYWORDS="amd64"
fi fi

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

@ -13,7 +13,11 @@ coreos:
- name: coreos-cloudinit-vagrant.service - name: coreos-cloudinit-vagrant.service
runtime: no runtime: no
content: | content: |
[Unit]
ConditionFileNotEmpty=/var/lib/coreos-vagrant/user-data
[Service] [Service]
Type=oneshot Type=oneshot
EnvironmentFile=/etc/environment EnvironmentFile=/etc/environment
ExecStart=/usr/bin/coreos-cloudinit --from-file /var/lib/coreos-vagrant/user-data ExecStart=/usr/bin/coreos-cloudinit --from-file /var/lib/coreos-vagrant/user-data
RemainAfterExit=yes