diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-15 20:13:07 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-15 20:13:07 -0400 |
| commit | bea35b7685978804557aada44c819c536ab209b3 (patch) | |
| tree | 070fb6db5efec8e0cd2e5d1d51d4c7f5e748085e /sysvinit/freebsd/cloudconfig | |
| parent | 668919511625f7b6a8922e4504e224e915f7be22 (diff) | |
| parent | 6093b8b2733814b9265494c47f4268167c9491ab (diff) | |
| download | vyos-cloud-init-bea35b7685978804557aada44c819c536ab209b3.tar.gz vyos-cloud-init-bea35b7685978804557aada44c819c536ab209b3.zip | |
merge from trunk
Diffstat (limited to 'sysvinit/freebsd/cloudconfig')
| -rwxr-xr-x | sysvinit/freebsd/cloudconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sysvinit/freebsd/cloudconfig b/sysvinit/freebsd/cloudconfig index 15d7ab95..44c216b3 100755 --- a/sysvinit/freebsd/cloudconfig +++ b/sysvinit/freebsd/cloudconfig @@ -6,28 +6,28 @@ . /etc/rc.subr +export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg + name="cloudconfig" -command="/usr/bin/cloud-init" +command="/usr/local/bin/cloud-init" start_cmd="cloudconfig_start" stop_cmd=":" rcvar="cloudinit_enable" start_precmd="cloudinit_override" start_cmd="cloudconfig_start" -: ${cloudinit_config:="/etc/cloud/cloud.cfg"} - cloudinit_override() { - # If there exist sysconfig/default variable override files use it... - if [ -f /etc/default/cloud-init ]; then - . /etc/default/cloud-init + # If there exist sysconfig/defaults variable override files use it... + if [ -f /etc/defaults/cloud-init ]; then + . /etc/defaults/cloud-init fi } cloudconfig_start() { echo "${command} starting" - ${command} ${cloudinit_config} modules --mode config + ${command} modules --mode config } load_rc_config $name |