4 files changed, 12 insertions, 0 deletions
diff --git a/sysvinit/netbsd/cloudconfig b/sysvinit/netbsd/cloudconfig
index 5cd7eb31..afc78ef3 100755
--- a/sysvinit/netbsd/cloudconfig
+++ b/sysvinit/netbsd/cloudconfig
@@ -10,6 +10,9 @@ name="cloudinit"
 start_cmd="start_cloud_init"
 start_cloud_init()
 {
+    test -e /etc/cloud/cloud-init.disabled \
+      && warn "cloud-init disabled by cloud-init.disabled file" \
+      && exit 0
     /usr/pkg/bin/cloud-init modules --mode config
 }
 
diff --git a/sysvinit/netbsd/cloudfinal b/sysvinit/netbsd/cloudfinal
index 72f3e472..82e1f1c2 100755
--- a/sysvinit/netbsd/cloudfinal
+++ b/sysvinit/netbsd/cloudfinal
@@ -9,6 +9,9 @@ name="cloudinit"
 start_cmd="start_cloud_init"
 start_cloud_init()
 {
+    test -e /etc/cloud/cloud-init.disabled \
+      && warn "cloud-init disabled by cloud-init.disabled file" \
+      && exit 0
     /usr/pkg/bin/cloud-init modules --mode final
 }
 
diff --git a/sysvinit/netbsd/cloudinit b/sysvinit/netbsd/cloudinit
index 266afc2a..8330953a 100755
--- a/sysvinit/netbsd/cloudinit
+++ b/sysvinit/netbsd/cloudinit
@@ -9,6 +9,9 @@ name="cloudinit"
 start_cmd="start_cloud_init"
 start_cloud_init()
 {
+    test -e /etc/cloud/cloud-init.disabled \
+      && warn "cloud-init disabled by cloud-init.disabled file" \
+      && exit 0
     /usr/pkg/bin/cloud-init init
 }
 
diff --git a/sysvinit/netbsd/cloudinitlocal b/sysvinit/netbsd/cloudinitlocal
index 1f30e70b..3a8ddcf1 100755
--- a/sysvinit/netbsd/cloudinitlocal
+++ b/sysvinit/netbsd/cloudinitlocal
@@ -11,6 +11,9 @@ name="cloudinitlocal"
 start_cmd="start_cloud_init_local"
 start_cloud_init_local()
 {
+    test -e /etc/cloud/cloud-init.disabled \
+      && warn "cloud-init disabled by cloud-init.disabled file" \
+      && exit 0
     /usr/pkg/bin/cloud-init init -l
 }