x/cloud-init
Code Issues Proposed changes

fix: Set the environment var CLOUD_CFG to specify the location of

Browse Source 
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.
This commit is contained in:
Harm Weites 2014-08-10 11:38:22 +00:00
parent 885830ae47
commit b4edd02e07
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysvinit/freebsd/cloudconfig
View File

@ -6,6 +6,8 @@
. /etc/rc.subr
export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
name="cloudconfig"
command="/usr/local/bin/cloud-init"
start_cmd="cloudconfig_start"
@ -14,8 +16,6 @@ rcvar="cloudinit_enable"
start_precmd="cloudinit_override"
start_cmd="cloudconfig_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()
cloudconfig_start()
{
echo "${command} starting"
${command} -f ${cloudinit_config} modules --mode config
${command} modules --mode config
}
load_rc_config $name

6
sysvinit/freebsd/cloudfinal
View File

@ -6,6 +6,8 @@
. /etc/rc.subr
export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
name="cloudfinal"
command="/usr/local/bin/cloud-init"
start_cmd="cloudfinal_start"
@ -14,8 +16,6 @@ rcvar="cloudinit_enable"
start_precmd="cloudinit_override"
start_cmd="cloudfinal_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()
cloudfinal_start()
{
echo -n "${command} starting"
${command} -f ${cloudinit_config} modules --mode final
${command} modules --mode final
}
load_rc_config $name

6
sysvinit/freebsd/cloudinit
View File

@ -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

6
sysvinit/freebsd/cloudinitlocal
View File

@ -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