merge from trunk

4 files changed, 28 insertions, 28 deletions

diff --git a/sysvinit/freebsd/cloudconfig b/sysvinit/freebsd/cloudconfig
index 15d7ab95..44c216b3 100755
--- a/sysvinit/freebsd/cloudconfig
+++ b/sysvinit/freebsd/cloudconfig
@@ -6,28 +6,28 @@
 
 . /etc/rc.subr
 
+export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
+
 name="cloudconfig"
-command="/usr/bin/cloud-init"
+command="/usr/local/bin/cloud-init"
 start_cmd="cloudconfig_start"
 stop_cmd=":"
 rcvar="cloudinit_enable"
 start_precmd="cloudinit_override"
 start_cmd="cloudconfig_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
 }
 
 cloudconfig_start()
 {
 	echo "${command} starting"
-	${command} ${cloudinit_config} modules --mode config
+	${command} modules --mode config
 }
 
 load_rc_config $name
diff --git a/sysvinit/freebsd/cloudfinal b/sysvinit/freebsd/cloudfinal
index 49945ecd..f668e036 100755
--- a/sysvinit/freebsd/cloudfinal
+++ b/sysvinit/freebsd/cloudfinal
@@ -6,28 +6,28 @@
 
 . /etc/rc.subr
 
+export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
+
 name="cloudfinal"
-command="/usr/bin/cloud_init"
+command="/usr/local/bin/cloud-init"
 start_cmd="cloudfinal_start"
 stop_cmd=":"
 rcvar="cloudinit_enable"
 start_precmd="cloudinit_override"
 start_cmd="cloudfinal_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
 }
 
 cloudfinal_start()
 {
 	echo -n "${command} starting"
-	${command} ${cloudinit_config} modules --mode final
+	${command} modules --mode final
 }
 
 load_rc_config $name
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
diff --git a/sysvinit/freebsd/cloudinitlocal b/sysvinit/freebsd/cloudinitlocal
index b55705c0..c340d5d0 100755
--- a/sysvinit/freebsd/cloudinitlocal
+++ b/sysvinit/freebsd/cloudinitlocal
@@ -6,28 +6,28 @@
 
 . /etc/rc.subr
 
+export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
+
 name="cloudinitlocal"
-command="/usr/bin/cloud-init"
+command="/usr/local/bin/cloud-init"
 start_cmd="cloudlocal_start"
 stop_cmd=":"
 rcvar="cloudinit_enable"
 start_precmd="cloudinit_override"
 start_cmd="cloudlocal_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
 }
 
 cloudlocal_start()
 {
 	echo -n "${command} starting"
-	${command} ${cloudinit_config} init --local
+	${command} init --local
 }
 
 load_rc_config $name