From bd6994b299b20c28ec4221dc732cdb3f1480d58d Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 18 Feb 2011 23:28:14 -0500
Subject: in nonet wait, print how long wait will be.

---
 upstart/cloud-init-nonet.conf | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'upstart')

diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf
index 65b120de..12f21320 100644
--- a/upstart/cloud-init-nonet.conf
+++ b/upstart/cloud-init-nonet.conf
@@ -13,9 +13,11 @@ script
    grep -qv '^lo' /var/run/network/ifstate >/dev/null 2>&1 && exit 0
 
    [ -f /var/lib/cloud/instance/obj.pkl ] && exit 0
-   sleep 10
-   echo $UPSTART_JOB "waiting for a network device."
-   sleep 60
+
+   short=10; long=60;
+   sleep ${short}
+   echo $UPSTART_JOB "waiting ${long} seconds for a network device."
+   sleep ${long}
    echo $UPSTART_JOB "gave up waiting for a network device."
    : > /var/lib/cloud/data/no-net
 end script
-- 
cgit v1.2.3