diff options
author | Brett Holman <brett.holman@canonical.com> | 2023-04-17 13:27:31 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-17 13:27:31 -0600 |
commit | 34e8c914df666c937e48f5d1c3add0bd47e4e7eb (patch) | |
tree | 2207a2b255910c746f5660635e30f3b287bff8e1 /sysvinit/netbsd | |
parent | 44ab4f4a18a325b6a2c915d7796bf00da5917c7b (diff) | |
download | cloud-init-git-34e8c914df666c937e48f5d1c3add0bd47e4e7eb.tar.gz |
Standardize disabling cloud-init on non-systemd (#2112)
Some distros support disabling cloud-init using the
kernel argument cloud-init=disabled. Standardize it
across non-systemd distros. Skip NetBSD, which
doesn't support passing external arguments to the
kernel.
Also add support for disabling cloud-init using
/etc/cloud/cloud-init.disabled to non-systemd
distros.
Diffstat (limited to 'sysvinit/netbsd')
-rwxr-xr-x | sysvinit/netbsd/cloudconfig | 3 | ||||
-rwxr-xr-x | sysvinit/netbsd/cloudfinal | 3 | ||||
-rwxr-xr-x | sysvinit/netbsd/cloudinit | 3 | ||||
-rwxr-xr-x | sysvinit/netbsd/cloudinitlocal | 3 |
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 } |