From d5445b4ba6d54bd859539fc9a1231bc35c480418 Mon Sep 17 00:00:00 2001
From: Roman Bogorodskiy <novel@FreeBSD.org>
Date: Sat, 24 Sep 2016 18:03:43 +0000
Subject: sysutils/cbsd: update to 11.0.0

- Tested on FreeBSD 11.0-RELEASE
- Improve IPv6 support
- Support ZVOL on ZFS-based system for bhyve vms
- jexport/jimport scripts has been rewriten to support zvol images
- Bhyve UEFI GOP support

PR:		212966
Submitted by:	maintainer
---
 sysutils/cbsd/files/cbsdd.in | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'sysutils/cbsd/files')

diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in
index 8c8bbc94da67..d4aa6072b702 100644
--- a/sysutils/cbsd/files/cbsdd.in
+++ b/sysutils/cbsd/files/cbsdd.in
@@ -57,11 +57,16 @@ command_args="&"
 
 cbsdd_prestart() {
 	%%PREFIX%%/bin/cbsd task mode=flushall > /dev/null 2>&1
-	%%PREFIX%%/bin/cbsd sysinv mode=update
-	%%PREFIX%%/bin/cbsd netinv
 
+	. ${distdir}/initenv.subr
 	. ${inventory}
 
+	%%PREFIX%%/bin/cbsd sysinv mode=update
+	%%PREFIX%%/bin/cbsd netinv
+	update_hwinfo
+	update_netinfo
+	env sqlcolnames="1" ${miscdir}/sqlcli ${dbdir}/local.sqlite "SELECT * FROM local" > ${inventory}
+
 	[ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton
 	/usr/sbin/daemon -f ${rcddir}/jails-astart start
 }
@@ -74,12 +79,12 @@ cbsdd_prestop()
 
 cbsdd_stop()
 {
-	[ -f "${pidfile}" ] && kill -9 $( cat ${pidfile} )
+	[ -f "${pidfile}" ] && kill -9 $( /bin/cat ${pidfile} )
 }
 
 cbsdd_reload()
 {
-	[ -f "${pidfile}" ] && kill -9 $( cat ${pidfile} ) > /dev/null 2>&1
+	[ -f "${pidfile}" ] && kill -9 $( /bin/cat ${pidfile} ) > /dev/null 2>&1
 	run_rc_command "start"
 	exit 0
 }
-- 
cgit v1.2.3