x/cloud-init
Code Issues Proposed changes

upstart/cloud-init-nonet.conf: only mention wait if larger than 5 seconds

Browse Source 
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.
This commit is contained in:
Scott Moser 2014-09-12 17:59:52 -04:00
parent 5cf8a6712e
commit f10188fb17
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
upstart/cloud-init-nonet.conf
View File

@ -46,7 +46,7 @@ script
} }
dowait() { dowait() {
msg "waiting $1 seconds for network device" [ $# -eq 2 ] || msg "waiting $1 seconds for network device"
sleep "$1" & sleep "$1" &
SLEEP_CHILD=$! SLEEP_CHILD=$!
wait $SLEEP_CHILD wait $SLEEP_CHILD
@ -58,8 +58,9 @@ script
# static_network_up already occurred # static_network_up already occurred
static_network_up && exit 0 static_network_up && exit 0
dowait 5 silent
dowait 10 dowait 10
dowait 120 dowait 115
msg "gave up waiting for a network device." msg "gave up waiting for a network device."
: > /var/lib/cloud/data/no-net : > /var/lib/cloud/data/no-net
end script end script