diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-12 13:03:44 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-12 13:03:44 -0400 |
| commit | b09b12bc0130b6787bfee0332addd055459b9629 (patch) | |
| tree | 3a4a40f42bd2fb87588342149fe72bcf2f82135e /upstart/cloud-init-local.conf | |
| parent | 26c1cf9eeeb39e9bfcc1a37743679e5c76ab97b0 (diff) | |
| download | vyos-cloud-init-b09b12bc0130b6787bfee0332addd055459b9629.tar.gz vyos-cloud-init-b09b12bc0130b6787bfee0332addd055459b9629.zip | |
upstart: add blocknet which blocks net until after cloud-init-local
This makes it so networking wont start to come up until after
cloud-init-local has had a chance to search local datasources
and set /etc/network/interfaces.
The changes most likely need to still be done for systemd.
LP: #1368861
Diffstat (limited to 'upstart/cloud-init-local.conf')
| -rw-r--r-- | upstart/cloud-init-local.conf | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/upstart/cloud-init-local.conf b/upstart/cloud-init-local.conf index 713b36d9..5def043d 100644 --- a/upstart/cloud-init-local.conf +++ b/upstart/cloud-init-local.conf @@ -6,4 +6,11 @@ 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 |