summaryrefslogtreecommitdiff
path: root/sysvinit
diff options
context:
space:
mode:
authorHarm Weites <harm@weites.com>2014-08-10 11:38:22 +0000
committerHarm Weites <harm@weites.com>2014-08-10 11:38:22 +0000
commitde0e832b51624603664eab189a083e612554125a (patch)
treed74b7dd3a6611635bc8c575b29c063c5d33b49e6 /sysvinit
parent891496973520c91fd02ccfc55aa606234418accb (diff)
downloadvyos-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')
-rwxr-xr-xsysvinit/freebsd/cloudconfig6
-rwxr-xr-xsysvinit/freebsd/cloudfinal6
-rwxr-xr-xsysvinit/freebsd/cloudinit6
-rwxr-xr-xsysvinit/freebsd/cloudinitlocal6
4 files changed, 12 insertions, 12 deletions
diff --git a/sysvinit/freebsd/cloudconfig b/sysvinit/freebsd/cloudconfig
index 985fb259..44c216b3 100755
--- a/sysvinit/freebsd/cloudconfig
+++ b/sysvinit/freebsd/cloudconfig
@@ -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
diff --git a/sysvinit/freebsd/cloudfinal b/sysvinit/freebsd/cloudfinal
index dd02b081..f668e036 100755
--- a/sysvinit/freebsd/cloudfinal
+++ b/sysvinit/freebsd/cloudfinal
@@ -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
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
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