diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-15 20:13:07 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-15 20:13:07 -0400 |
| commit | bea35b7685978804557aada44c819c536ab209b3 (patch) | |
| tree | 070fb6db5efec8e0cd2e5d1d51d4c7f5e748085e /upstart/cloud-init-local.conf | |
| parent | 668919511625f7b6a8922e4504e224e915f7be22 (diff) | |
| parent | 6093b8b2733814b9265494c47f4268167c9491ab (diff) | |
| download | vyos-cloud-init-bea35b7685978804557aada44c819c536ab209b3.tar.gz vyos-cloud-init-bea35b7685978804557aada44c819c536ab209b3.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 |