summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--upstart/cloud-init-nonet.conf5
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