diff options
| author | Harm Weites <harm@weites.com> | 2014-08-10 11:38:22 +0000 |
|---|---|---|
| committer | Harm Weites <harm@weites.com> | 2014-08-10 11:38:22 +0000 |
| commit | de0e832b51624603664eab189a083e612554125a (patch) | |
| tree | d74b7dd3a6611635bc8c575b29c063c5d33b49e6 /sysvinit/freebsd/cloudinit | |
| parent | 891496973520c91fd02ccfc55aa606234418accb (diff) | |
| download | vyos-cloud-init-de0e832b51624603664eab189a083e612554125a.tar.gz vyos-cloud-init-de0e832b51624603664eab189a083e612554125a.zip | |
fix: Set the environment var CLOUD_CFG to specify the location of
cloud.cfg since -f is not used for that.
Given the importance of this file/location, it's explicitly beeing set
in the initscripts instead of trusting on something in /etc/defaults.
Diffstat (limited to 'sysvinit/freebsd/cloudinit')
| -rwxr-xr-x | sysvinit/freebsd/cloudinit | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit index 17eaa547..c5478678 100755 --- a/sysvinit/freebsd/cloudinit +++ b/sysvinit/freebsd/cloudinit @@ -6,6 +6,8 @@ . /etc/rc.subr +export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg + name="cloudinit" command="/usr/local/bin/cloud-init" start_cmd="cloudinit_start" @@ -14,8 +16,6 @@ rcvar="cloudinit_enable" start_precmd="cloudinit_override" start_cmd="cloudinit_start" -: ${cloudinit_config:="/usr/local/etc/cloud/cloud.cfg"} - cloudinit_override() { # If there exist sysconfig/defaults variable override files use it... @@ -27,7 +27,7 @@ cloudinit_override() cloudinit_start() { echo -n "${command} starting" - ${command} -f ${cloudinit_config} init + ${command} init } load_rc_config $name |