Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Sep 2016 18:03:43 +0000 (UTC)
From:      Roman Bogorodskiy <novel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r422736 - in head/sysutils/cbsd: . files
Message-ID:  <201609241803.u8OI3h9c099624@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: novel
Date: Sat Sep 24 18:03:43 2016
New Revision: 422736
URL: https://svnweb.freebsd.org/changeset/ports/422736

Log:
  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

Modified:
  head/sysutils/cbsd/Makefile
  head/sysutils/cbsd/distinfo
  head/sysutils/cbsd/files/cbsdd.in

Modified: head/sysutils/cbsd/Makefile
==============================================================================
--- head/sysutils/cbsd/Makefile	Sat Sep 24 17:47:48 2016	(r422735)
+++ head/sysutils/cbsd/Makefile	Sat Sep 24 18:03:43 2016	(r422736)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-PORTVERSION=	10.3.3
+PORTVERSION=	11.0.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
@@ -35,10 +35,6 @@ GROUPS=	${PORTNAME}
 IGNORE=	does not support FreeBSD versions < 10.0
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
-LIB_DEPENDS+=	libxo.so:devel/libxo
-.endif
-
 do-install:
 	@${ECHO} "Installing in ${CBSD_HOME}"
 	${MKDIR} ${STAGEDIR}${CBSD_HOME}

Modified: head/sysutils/cbsd/distinfo
==============================================================================
--- head/sysutils/cbsd/distinfo	Sat Sep 24 17:47:48 2016	(r422735)
+++ head/sysutils/cbsd/distinfo	Sat Sep 24 18:03:43 2016	(r422736)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470864569
-SHA256 (olevole-cbsd-10.3.3_GH0.tar.gz) = 71574cb7aa234d1a49d4b9ae2182446855a745bddcff877b6bfc56b6bc45aa46
-SIZE (olevole-cbsd-10.3.3_GH0.tar.gz) = 2246656
+TIMESTAMP = 1474732408
+SHA256 (olevole-cbsd-11.0.0_GH0.tar.gz) = 4b0a062e7612116ac5b890cf03298380681aaee540741cddd4ad200096859c0a
+SIZE (olevole-cbsd-11.0.0_GH0.tar.gz) = 2344726

Modified: head/sysutils/cbsd/files/cbsdd.in
==============================================================================
--- head/sysutils/cbsd/files/cbsdd.in	Sat Sep 24 17:47:48 2016	(r422735)
+++ head/sysutils/cbsd/files/cbsdd.in	Sat Sep 24 18:03:43 2016	(r422736)
@@ -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
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609241803.u8OI3h9c099624>