From de0e832b51624603664eab189a083e612554125a Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Sun, 10 Aug 2014 11:38:22 +0000 Subject: 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. --- sysvinit/freebsd/cloudinitlocal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sysvinit/freebsd/cloudinitlocal') diff --git a/sysvinit/freebsd/cloudinitlocal b/sysvinit/freebsd/cloudinitlocal index 4b122ee5..c340d5d0 100755 --- a/sysvinit/freebsd/cloudinitlocal +++ b/sysvinit/freebsd/cloudinitlocal @@ -6,6 +6,8 @@ . /etc/rc.subr +export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg + name="cloudinitlocal" command="/usr/local/bin/cloud-init" start_cmd="cloudlocal_start" @@ -14,8 +16,6 @@ rcvar="cloudinit_enable" start_precmd="cloudinit_override" start_cmd="cloudlocal_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() cloudlocal_start() { echo -n "${command} starting" - ${command} -f ${cloudinit_config} init --local + ${command} init --local } load_rc_config $name -- cgit v1.2.3