diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-12 17:45:20 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-12 17:45:20 -0400 |
| commit | 41a52ef99a9dddd3fef9bdc883dfca55770ef2a5 (patch) | |
| tree | bfd9627110a11b0496d1d5db933d50cc9996a9ab /upstart | |
| parent | 8eb2f6ea588775d3ddd55a62630cab310497190e (diff) | |
| download | vyos-cloud-init-41a52ef99a9dddd3fef9bdc883dfca55770ef2a5.tar.gz vyos-cloud-init-41a52ef99a9dddd3fef9bdc883dfca55770ef2a5.zip | |
upstart/cloud-init-nonet.conf: do not exit on existance of obj.pkl
not sure why this was here.
the intent must of have been to allow for a local datasource
to continue booting and not annoyingly block waiting for network information
(if ithere was no network information).
However, that seems wrong.
If the datasource wipes /etc/network/interfaces and there are no network
interfaces then we're probably breaking that use case here. However we're
fixing the other more common case.
Diffstat (limited to 'upstart')
| -rw-r--r-- | upstart/cloud-init-nonet.conf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf index 40059ad6..38630b39 100644 --- a/upstart/cloud-init-nonet.conf +++ b/upstart/cloud-init-nonet.conf @@ -58,9 +58,6 @@ script # static_network_up already occurred static_network_up && exit 0 - # local-finished comes from cloud-init-local - [ -f /run/cloud-init/local-finished ] && exit 0 - dowait 10 dowait 120 msg "gave up waiting for a network device." |