diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:00:39 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:00:39 -0400 |
| commit | b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488 (patch) | |
| tree | 186d80c155d32f75d8efa3c6ec1ad3562f11ba0a /upstart/cloud-init-local.conf | |
| parent | 26e6c265277cf5e29b8af311f2bb8759b0e811cd (diff) | |
| parent | b76866ad72d433cc9008a137c464c7ed44401549 (diff) | |
| download | vyos-cloud-init-b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488.tar.gz vyos-cloud-init-b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488.zip | |
merge from trunk
Diffstat (limited to 'upstart/cloud-init-local.conf')
| -rw-r--r-- | upstart/cloud-init-local.conf | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/upstart/cloud-init-local.conf b/upstart/cloud-init-local.conf index 061fe406..5def043d 100644 --- a/upstart/cloud-init-local.conf +++ b/upstart/cloud-init-local.conf @@ -1,9 +1,16 @@ # cloud-init - the initial cloud-init job # crawls metadata service, emits cloud-config -start on mounted MOUNTPOINT=/ +start on mounted MOUNTPOINT=/ and mounted MOUNTPOINT=/run task console output -exec /usr/bin/cloud-init init --local +script + lfin=/run/cloud-init/local-finished + ret=0 + cloud-init init --local || ret=$? + [ -r /proc/uptime ] && read up idle < /proc/uptime || up="N/A" + echo "$ret up $up" > "$lfin" + exit $ret +end script |