From ca1e2e17e5ae4af811826518f46631c9962f8292 Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Sat, 9 Aug 2014 08:09:02 +0000 Subject: fix: The correct path end with an s. --- sysvinit/freebsd/cloudconfig | 6 +++--- sysvinit/freebsd/cloudfinal | 6 +++--- sysvinit/freebsd/cloudinit | 6 +++--- sysvinit/freebsd/cloudinitlocal | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'sysvinit') diff --git a/sysvinit/freebsd/cloudconfig b/sysvinit/freebsd/cloudconfig index 15d7ab95..73877b6f 100755 --- a/sysvinit/freebsd/cloudconfig +++ b/sysvinit/freebsd/cloudconfig @@ -18,9 +18,9 @@ start_cmd="cloudconfig_start" 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 } diff --git a/sysvinit/freebsd/cloudfinal b/sysvinit/freebsd/cloudfinal index 49945ecd..292dd8fb 100755 --- a/sysvinit/freebsd/cloudfinal +++ b/sysvinit/freebsd/cloudfinal @@ -18,9 +18,9 @@ start_cmd="cloudfinal_start" 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 } diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit index 8d5ff10e..23a1247b 100755 --- a/sysvinit/freebsd/cloudinit +++ b/sysvinit/freebsd/cloudinit @@ -18,9 +18,9 @@ start_cmd="cloudinit_start" 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 } diff --git a/sysvinit/freebsd/cloudinitlocal b/sysvinit/freebsd/cloudinitlocal index b55705c0..b96d1513 100755 --- a/sysvinit/freebsd/cloudinitlocal +++ b/sysvinit/freebsd/cloudinitlocal @@ -18,9 +18,9 @@ start_cmd="cloudlocal_start" 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 } -- cgit v1.2.3 From f72be738ba5e8556aae3bccd765754ea01555389 Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Sat, 9 Aug 2014 09:58:12 +0000 Subject: change: Cloud-init config should go under /usr/local since /etc/ is reserved for base. --- sysvinit/freebsd/cloudconfig | 2 +- sysvinit/freebsd/cloudfinal | 2 +- sysvinit/freebsd/cloudinit | 2 +- sysvinit/freebsd/cloudinitlocal | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sysvinit') diff --git a/sysvinit/freebsd/cloudconfig b/sysvinit/freebsd/cloudconfig index 73877b6f..0a058ddb 100755 --- a/sysvinit/freebsd/cloudconfig +++ b/sysvinit/freebsd/cloudconfig @@ -14,7 +14,7 @@ rcvar="cloudinit_enable" start_precmd="cloudinit_override" start_cmd="cloudconfig_start" -: ${cloudinit_config:="/etc/cloud/cloud.cfg"} +: ${cloudinit_config:="/usr/local/etc/cloud/cloud.cfg"} cloudinit_override() { diff --git a/sysvinit/freebsd/cloudfinal b/sysvinit/freebsd/cloudfinal index 292dd8fb..a97e65f9 100755 --- a/sysvinit/freebsd/cloudfinal +++ b/sysvinit/freebsd/cloudfinal @@ -14,7 +14,7 @@ rcvar="cloudinit_enable" start_precmd="cloudinit_override" start_cmd="cloudfinal_start" -: ${cloudinit_config:="/etc/cloud/cloud.cfg"} +: ${cloudinit_config:="/usr/local/etc/cloud/cloud.cfg"} cloudinit_override() { diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit index 23a1247b..f751963b 100755 --- a/sysvinit/freebsd/cloudinit +++ b/sysvinit/freebsd/cloudinit @@ -14,7 +14,7 @@ rcvar="cloudinit_enable" start_precmd="cloudinit_override" start_cmd="cloudinit_start" -: ${cloudinit_config:="/etc/cloud/cloud.cfg"} +: ${cloudinit_config:="/usr/local/etc/cloud/cloud.cfg"} cloudinit_override() { diff --git a/sysvinit/freebsd/cloudinitlocal b/sysvinit/freebsd/cloudinitlocal index b96d1513..2b5df3c9 100755 --- a/sysvinit/freebsd/cloudinitlocal +++ b/sysvinit/freebsd/cloudinitlocal @@ -14,7 +14,7 @@ rcvar="cloudinit_enable" start_precmd="cloudinit_override" start_cmd="cloudlocal_start" -: ${cloudinit_config:="/etc/cloud/cloud.cfg"} +: ${cloudinit_config:="/usr/local/etc/cloud/cloud.cfg"} cloudinit_override() { -- cgit v1.2.3 From ffc621738b172c9805c083c265eed13b415bb3f4 Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Sat, 9 Aug 2014 10:11:50 +0000 Subject: fix: Command (the binary) is cloud-init, not cloud_init. --- sysvinit/freebsd/cloudfinal | 2 +- sysvinit/freebsd/cloudinit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sysvinit') diff --git a/sysvinit/freebsd/cloudfinal b/sysvinit/freebsd/cloudfinal index a97e65f9..f044f1f3 100755 --- a/sysvinit/freebsd/cloudfinal +++ b/sysvinit/freebsd/cloudfinal @@ -7,7 +7,7 @@ . /etc/rc.subr name="cloudfinal" -command="/usr/bin/cloud_init" +command="/usr/bin/cloud-init" start_cmd="cloudfinal_start" stop_cmd=":" rcvar="cloudinit_enable" diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit index f751963b..571b57d0 100755 --- a/sysvinit/freebsd/cloudinit +++ b/sysvinit/freebsd/cloudinit @@ -7,7 +7,7 @@ . /etc/rc.subr name="cloudinit" -command="/usr/bin/cloud_init" +command="/usr/bin/cloud-init" start_cmd="cloudinit_start" stop_cmd=":" rcvar="cloudinit_enable" -- cgit v1.2.3 From 590685594897069fe57753f197753aab5cb440e9 Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Sat, 9 Aug 2014 10:14:41 +0000 Subject: change: C-i is installed in /usr/local/. --- sysvinit/freebsd/cloudconfig | 2 +- sysvinit/freebsd/cloudfinal | 2 +- sysvinit/freebsd/cloudinit | 2 +- sysvinit/freebsd/cloudinitlocal | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sysvinit') diff --git a/sysvinit/freebsd/cloudconfig b/sysvinit/freebsd/cloudconfig index 0a058ddb..b40257ab 100755 --- a/sysvinit/freebsd/cloudconfig +++ b/sysvinit/freebsd/cloudconfig @@ -7,7 +7,7 @@ . /etc/rc.subr name="cloudconfig" -command="/usr/bin/cloud-init" +command="/usr/local/bin/cloud-init" start_cmd="cloudconfig_start" stop_cmd=":" rcvar="cloudinit_enable" diff --git a/sysvinit/freebsd/cloudfinal b/sysvinit/freebsd/cloudfinal index f044f1f3..5f2c4155 100755 --- a/sysvinit/freebsd/cloudfinal +++ b/sysvinit/freebsd/cloudfinal @@ -7,7 +7,7 @@ . /etc/rc.subr name="cloudfinal" -command="/usr/bin/cloud-init" +command="/usr/local/bin/cloud-init" start_cmd="cloudfinal_start" stop_cmd=":" rcvar="cloudinit_enable" diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit index 571b57d0..14b0257e 100755 --- a/sysvinit/freebsd/cloudinit +++ b/sysvinit/freebsd/cloudinit @@ -7,7 +7,7 @@ . /etc/rc.subr name="cloudinit" -command="/usr/bin/cloud-init" +command="/usr/local/bin/cloud-init" start_cmd="cloudinit_start" stop_cmd=":" rcvar="cloudinit_enable" diff --git a/sysvinit/freebsd/cloudinitlocal b/sysvinit/freebsd/cloudinitlocal index 2b5df3c9..fdab2a12 100755 --- a/sysvinit/freebsd/cloudinitlocal +++ b/sysvinit/freebsd/cloudinitlocal @@ -7,7 +7,7 @@ . /etc/rc.subr name="cloudinitlocal" -command="/usr/bin/cloud-init" +command="/usr/local/bin/cloud-init" start_cmd="cloudlocal_start" stop_cmd=":" rcvar="cloudinit_enable" -- cgit v1.2.3 From c08262be060f6a4e89c94f81f83d7e884b66a5cf Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Sat, 9 Aug 2014 10:24:34 +0000 Subject: fix: Use -f to properly load the configfile. --- sysvinit/freebsd/cloudconfig | 2 +- sysvinit/freebsd/cloudfinal | 2 +- sysvinit/freebsd/cloudinit | 2 +- sysvinit/freebsd/cloudinitlocal | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sysvinit') diff --git a/sysvinit/freebsd/cloudconfig b/sysvinit/freebsd/cloudconfig index b40257ab..985fb259 100755 --- a/sysvinit/freebsd/cloudconfig +++ b/sysvinit/freebsd/cloudconfig @@ -27,7 +27,7 @@ cloudinit_override() cloudconfig_start() { echo "${command} starting" - ${command} ${cloudinit_config} modules --mode config + ${command} -f ${cloudinit_config} modules --mode config } load_rc_config $name diff --git a/sysvinit/freebsd/cloudfinal b/sysvinit/freebsd/cloudfinal index 5f2c4155..dd02b081 100755 --- a/sysvinit/freebsd/cloudfinal +++ b/sysvinit/freebsd/cloudfinal @@ -27,7 +27,7 @@ cloudinit_override() cloudfinal_start() { echo -n "${command} starting" - ${command} ${cloudinit_config} modules --mode final + ${command} -f ${cloudinit_config} modules --mode final } load_rc_config $name diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit index 14b0257e..17eaa547 100755 --- a/sysvinit/freebsd/cloudinit +++ b/sysvinit/freebsd/cloudinit @@ -27,7 +27,7 @@ cloudinit_override() cloudinit_start() { echo -n "${command} starting" - ${command} ${cloudinit_config} init + ${command} -f ${cloudinit_config} init } load_rc_config $name diff --git a/sysvinit/freebsd/cloudinitlocal b/sysvinit/freebsd/cloudinitlocal index fdab2a12..4b122ee5 100755 --- a/sysvinit/freebsd/cloudinitlocal +++ b/sysvinit/freebsd/cloudinitlocal @@ -27,7 +27,7 @@ cloudinit_override() cloudlocal_start() { echo -n "${command} starting" - ${command} ${cloudinit_config} init --local + ${command} -f ${cloudinit_config} init --local } load_rc_config $name -- cgit v1.2.3 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/cloudconfig | 6 +++--- sysvinit/freebsd/cloudfinal | 6 +++--- sysvinit/freebsd/cloudinit | 6 +++--- sysvinit/freebsd/cloudinitlocal | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'sysvinit') 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 -- cgit v1.2.3