summaryrefslogtreecommitdiff
path: root/upstart
diff options
context:
space:
mode:
Diffstat (limited to 'upstart')
-rw-r--r--upstart/cloud-init-nonet.conf9
1 files changed, 5 insertions, 4 deletions
diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf
index 01916354..70c7dfea 100644
--- a/upstart/cloud-init-nonet.conf
+++ b/upstart/cloud-init-nonet.conf
@@ -10,10 +10,11 @@ task
console output
script
- # /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
+ # /run/network/static-network-up-emitted is written by
+ # upstart (via /etc/network/if-up.d/upstart). its presense would
+ # indicate that static-network-up has already fired.
+ EMITTED="/run/network/static-network-up-emitted"
+ [ -e "$EMITTED" -o -e "/var/$EMITTED" ] && exit 0
[ -f /var/lib/cloud/instance/obj.pkl ] && exit 0