summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--upstart/cloud-init-nonet.conf6
1 files changed, 4 insertions, 2 deletions
diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf
index 9a47b105..a39daf35 100644
--- a/upstart/cloud-init-nonet.conf
+++ b/upstart/cloud-init-nonet.conf
@@ -9,8 +9,10 @@ task
console output
script
- # if a non 'lo' interface is up, exit immediately
- grep -qv '^lo' /var/run/network/ifstate >/dev/null 2>&1 && exit 0
+ # /var/run/network/static-network-up-emitted is written by
+ # /etc/network/if-up.d/upstart its presense would indicate
+ # that static-network-up has already fired.
+ [ -e /var/run/network/static-network-up-emitted ] && exit 0
[ -f /var/lib/cloud/instance/obj.pkl ] && exit 0