diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-12 17:59:52 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-12 17:59:52 -0400 |
| commit | f5be74dc84aac7bb9a634e5518f5aac6ae80098a (patch) | |
| tree | 8579dba15c43fa53c09d704b149c97c76b382d59 /upstart | |
| parent | 32be9ac3d7dc2a2361bccaafbc8f7b8636d564a7 (diff) | |
| download | vyos-cloud-init-f5be74dc84aac7bb9a634e5518f5aac6ae80098a.tar.gz vyos-cloud-init-f5be74dc84aac7bb9a634e5518f5aac6ae80098a.zip | |
upstart/cloud-init-nonet.conf: only mention wait if larger than 5 seconds
silently wait 5 seconds for networking to come up.
We started seeing the message more now, as we are now blocking
the networking from coming up until cloud-init-local is done.
Previously that would have happened in parallel, and we were less likely
to see that message.
Diffstat (limited to 'upstart')
| -rw-r--r-- | upstart/cloud-init-nonet.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf index 38630b39..6abf6573 100644 --- a/upstart/cloud-init-nonet.conf +++ b/upstart/cloud-init-nonet.conf @@ -46,7 +46,7 @@ script } dowait() { - msg "waiting $1 seconds for network device" + [ $# -eq 2 ] || msg "waiting $1 seconds for network device" sleep "$1" & SLEEP_CHILD=$! wait $SLEEP_CHILD @@ -58,8 +58,9 @@ script # static_network_up already occurred static_network_up && exit 0 + dowait 5 silent dowait 10 - dowait 120 + dowait 115 msg "gave up waiting for a network device." : > /var/lib/cloud/data/no-net end script |