diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-10 15:06:51 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-10 15:06:51 -0400 |
| commit | 0ea631a556522060f5075496adbac5f5637e7597 (patch) | |
| tree | ec363e83bd7ab44b61a19c96209a9123749c459c /sysvinit/freebsd/cloudinit | |
| parent | 6386accbf4933ecb368d2f32b7db95583e03b525 (diff) | |
| parent | 67f198ceb6dfeb82b2d3f78955d21d09d43fa7db (diff) | |
| download | vyos-cloud-init-0ea631a556522060f5075496adbac5f5637e7597.tar.gz vyos-cloud-init-0ea631a556522060f5075496adbac5f5637e7597.zip | |
merge from trunk
Diffstat (limited to 'sysvinit/freebsd/cloudinit')
| -rwxr-xr-x | sysvinit/freebsd/cloudinit | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit index 8d5ff10e..c5478678 100755 --- a/sysvinit/freebsd/cloudinit +++ b/sysvinit/freebsd/cloudinit @@ -6,28 +6,28 @@ . /etc/rc.subr +export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg + name="cloudinit" -command="/usr/bin/cloud_init" +command="/usr/local/bin/cloud-init" start_cmd="cloudinit_start" stop_cmd=":" rcvar="cloudinit_enable" start_precmd="cloudinit_override" start_cmd="cloudinit_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 } cloudinit_start() { echo -n "${command} starting" - ${command} ${cloudinit_config} init + ${command} init } load_rc_config $name |