From 8eb2f6ea588775d3ddd55a62630cab310497190e Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 12 Sep 2014 15:38:56 -0400
Subject: allow local disabling of blocknet

---
 upstart/cloud-init-blocknet.conf | 2 ++
 1 file changed, 2 insertions(+)

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"
-- 
cgit v1.2.3