summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--upstart/cloud-init-blocknet.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/upstart/cloud-init-blocknet.conf b/upstart/cloud-init-blocknet.conf
index 82d5ffbc..dd4f1798 100644
--- a/upstart/cloud-init-blocknet.conf
+++ b/upstart/cloud-init-blocknet.conf
@@ -75,7 +75,9 @@ script
# local-finished cloud-init-local success or failure
lfin="/run/cloud-init/local-finished"
+ disable="/etc/cloud/no-blocknet"
[ -f "$lfin" ] && { msg "$lfin found"; exit 0; }
+ [ -f "$disable" ] && { msg "$disable found"; exit 0; }
dowait 120
msg "gave up waiting for $lfin"