4 files changed, 1 insertions, 41 deletions
diff --git a/sysvinit/freebsd/cloudconfig b/sysvinit/freebsd/cloudconfig
index 01bc061e..e4064fa3 100755
--- a/sysvinit/freebsd/cloudconfig
+++ b/sysvinit/freebsd/cloudconfig
@@ -7,24 +7,14 @@
 . /etc/rc.subr
 
 PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
 
 name="cloudconfig"
 command="/usr/local/bin/cloud-init"
 start_cmd="cloudconfig_start"
 stop_cmd=":"
 rcvar="cloudinit_enable"
-start_precmd="cloudinit_override"
 start_cmd="cloudconfig_start"
 
-cloudinit_override()
-{
-	# 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"
diff --git a/sysvinit/freebsd/cloudfinal b/sysvinit/freebsd/cloudfinal
index 1b487aa0..b6894c39 100755
--- a/sysvinit/freebsd/cloudfinal
+++ b/sysvinit/freebsd/cloudfinal
@@ -7,24 +7,14 @@
 . /etc/rc.subr
 
 PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
 
 name="cloudfinal"
 command="/usr/local/bin/cloud-init"
 start_cmd="cloudfinal_start"
 stop_cmd=":"
 rcvar="cloudinit_enable"
-start_precmd="cloudinit_override"
 start_cmd="cloudfinal_start"
 
-cloudinit_override()
-{
-	# 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"
diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit
index 862eeab4..33263009 100755
--- a/sysvinit/freebsd/cloudinit
+++ b/sysvinit/freebsd/cloudinit
@@ -7,24 +7,14 @@
 . /etc/rc.subr
 
 PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
 
 name="cloudinit"
 command="/usr/local/bin/cloud-init"
 start_cmd="cloudinit_start"
 stop_cmd=":"
 rcvar="cloudinit_enable"
-start_precmd="cloudinit_override"
 start_cmd="cloudinit_start"
 
-cloudinit_override()
-{
-	# 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"
diff --git a/sysvinit/freebsd/cloudinitlocal b/sysvinit/freebsd/cloudinitlocal
index fb342a0f..11a5eb1c 100755
--- a/sysvinit/freebsd/cloudinitlocal
+++ b/sysvinit/freebsd/cloudinitlocal
@@ -1,30 +1,20 @@
 #!/bin/sh
 
 # PROVIDE: cloudinitlocal
-# REQUIRE: mountcritlocal 
+# REQUIRE: ldconfig mountcritlocal 
 # BEFORE:  NETWORKING FILESYSTEMS cloudinit cloudconfig cloudfinal
 
 . /etc/rc.subr
 
 PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
 
 name="cloudinitlocal"
 command="/usr/local/bin/cloud-init"
 start_cmd="cloudlocal_start"
 stop_cmd=":"
 rcvar="cloudinit_enable"
-start_precmd="cloudinit_override"
 start_cmd="cloudlocal_start"
 
-cloudinit_override()
-{
-	# 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"