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-nonet.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-nonet.conf')
| -rw-r--r-- | upstart/cloud-init-nonet.conf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf index e8ebee96..40059ad6 100644 --- a/upstart/cloud-init-nonet.conf +++ b/upstart/cloud-init-nonet.conf @@ -58,9 +58,8 @@ script # static_network_up already occurred static_network_up && exit 0 - # obj.pkl comes from cloud-init-local (or previous boot and - # manual_cache_clean) - [ -f /var/lib/cloud/instance/obj.pkl ] && exit 0 + # local-finished comes from cloud-init-local + [ -f /run/cloud-init/local-finished ] && exit 0 dowait 10 dowait 120 |