- Update to 10.0.7

- fixes for incorrect ZFS fs name in jcoldmigrate
- jail start via taskd
- bhyve: support for VM auto start
- bhyve: add virtio RNG for FreeBSD 10.1+

PR:		192662
Submitted by:	olevole@olevole.ru (maintainer)

2 files changed, 4 insertions, 2 deletions

diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in
index eeda220ad335..b8df5acdd434 100644
--- a/sysutils/cbsd/files/cbsdd.in
+++ b/sysutils/cbsd/files/cbsdd.in
@@ -60,6 +60,7 @@ pidfile="/var/run/$name.pid"
 command_args="&"
 
 cbsdd_prestart() {
+	%%PREFIX%%/bin/cbsd task mode=flushall > /dev/null 2>&1
 	/usr/bin/find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \;
 	%%PREFIX%%/bin/cbsd sysinv mode=update
 	%%PREFIX%%/bin/cbsd netinv
@@ -67,7 +68,7 @@ cbsdd_prestart() {
 	. ${inventory}
 
 	[ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton
-	/usr/sbin/daemon ${rcddir}/jails-astart start
+	/usr/sbin/daemon -f ${rcddir}/jails-astart start
 }
 
 cbsdd_prestop()
diff --git a/sysutils/cbsd/files/cbsdrsyncd.in b/sysutils/cbsd/files/cbsdrsyncd.in
index fe554dd9dbe2..02d74d5ba6c2 100644
--- a/sysutils/cbsd/files/cbsdrsyncd.in
+++ b/sysutils/cbsd/files/cbsdrsyncd.in
@@ -10,6 +10,7 @@
 #
 
 . /etc/rc.subr
+. /etc/rc.conf
 
 name="cbsdrsyncd"
 rcvar=cbsdrsyncd_enable
@@ -17,7 +18,7 @@ rcvar=cbsdrsyncd_enable
 command="%%PREFIX%%/bin/rsync"
 command_args="--daemon"
 pidfile="/var/run/$name.pid"
-required_files="${cbsd_workdir}/etc/$name.conf"
+required_files="${cbsd_workdir}/etc/rsyncd.conf"
 
 # read configuration and set defaults
 load_rc_config "$name"