Index: head/sysutils/cbsd/Makefile
===================================================================
--- head/sysutils/cbsd/Makefile	(revision 511832)
+++ head/sysutils/cbsd/Makefile	(revision 511833)
@@ -1,54 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-DISTVERSION=	12.0.14
+DISTVERSION=	12.1.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
 COMMENT=	Yet another FreeBSD Jail, XEN and Bhyve Management Utility
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rsync:net/rsync \
 		sudo:security/sudo \
 		sqlite3:databases/sqlite3 \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 LIB_DEPENDS=	libssh2.so:security/libssh2 \
 		libsqlite3.so:databases/sqlite3
 
 USES=		libedit pkgconfig:both
 USE_GITHUB=	yes
 USE_RC_SUBR=	cbsdd cbsdrsyncd cbsd-statsd-bhyve cbsd-statsd-hoster cbsd-statsd-jail
 
 CFLAGS_powerpc64=	-mminimal-toc
 
 SUB_FILES=	pkg-message pkg-deinstall
 
 CBSD_HOME?=	${PREFIX}/cbsd
 
 USERS=	${PORTNAME}
 GROUPS=	${PORTNAME}
 
 BIN_FILES=	\
 		bin/cbsdsh/mknodes \
 		bin/cbsdsh/mksyntax
 
 do-install:
 	@${ECHO} "Installing in ${CBSD_HOME}"
 	${MKDIR} ${STAGEDIR}${CBSD_HOME}
 	${CP} -a ${WRKSRC}/ ${STAGEDIR}${CBSD_HOME}
 .for i in ${BIN_FILES}
 	${STRIP_CMD} ${STAGEDIR}${CBSD_HOME}/${i}
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/cbsdsh/cbsd ${STAGEDIR}${PREFIX}/bin
 
 post-install:
 	${CAT} ${PKGDIR}/pkg-plist-chunk > ${TMPPLIST} ;
 	@${FIND} -s ${STAGEDIR}${CBSD_HOME} -not -type d | ${SORT} | \
 	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/bsdconfig
 	@${LN} -sf ${CBSD_HOME}/share/bsdconfig/cbsd ${STAGEDIR}${PREFIX}/libexec/bsdconfig/cbsd
 
 .include <bsd.port.mk>
Index: head/sysutils/cbsd/distinfo
===================================================================
--- head/sysutils/cbsd/distinfo	(revision 511832)
+++ head/sysutils/cbsd/distinfo	(revision 511833)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565785458
-SHA256 (cbsd-cbsd-12.0.14_GH0.tar.gz) = 5b6b8aee2bcc49d72f161dcbc10d1c4c05c9c1cd4a924b16f78aa2a118e836df
-SIZE (cbsd-cbsd-12.0.14_GH0.tar.gz) = 5855012
+TIMESTAMP = 1568225678
+SHA256 (cbsd-cbsd-12.1.0_GH0.tar.gz) = edc9394f2b3d240b0dcd16b1021ff6b53c66f46724b78e70d2cdfacfe7795faa
+SIZE (cbsd-cbsd-12.1.0_GH0.tar.gz) = 5857565
Index: head/sysutils/cbsd/files/cbsdd.in
===================================================================
--- head/sysutils/cbsd/files/cbsdd.in	(revision 511832)
+++ head/sysutils/cbsd/files/cbsdd.in	(revision 511833)
@@ -1,122 +1,121 @@
 #!/bin/sh
 #
 # PROVIDE: cbsdd
 # REQUIRE: LOGIN FILESYSTEMS sshd
 # KEYWORD: shutdown
 #
 # cbsdd_enable="YES"
 #
 
 . /etc/rc.subr
 
 name=cbsdd
 rcvar=cbsdd_enable
 load_rc_config $name
 
 : ${cbsdd_enable="NO"}
 
 export workdir="${cbsd_workdir}"
 export NO_CBSD_HISTORY=yes
 globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"}
 
 if [ ! -f ${globalconf} ]; then
 	echo "cbsd: no such ${globalconf}";
 	exit 1
 fi
 
 if [ ! -f ${mdtools} ]; then
 	echo "cbsd: no such ${mdtools}";
 	exit 1
 fi
 
 if [ ! -f ${subr} ]; then
 	echo "cbsd: no such ${subr}";
 	exit 1
 fi
 
 if [ ! -f ${localcbsdconf} ]; then
 	echo "cbsd: no such ${localcbsdconf}";
 	exit 1
 fi
 
 . ${globalconf}
 . ${mdtools}
 . ${subr}
 
 . ${localcbsdconf}
 
 start_precmd=${name}_prestart
 stop_precmd=${name}_prestop
 stop_cmd=${name}_stop
 status_cmd="${name}_status"
 restart_cmd=${name}_restart
 extra_commands="restart"
 
 command="${toolsdir}/cbsdd"
 pidfile="${cbsd_workdir}/var/run/$name.pid"
 command_args="&"
 
 cbsdd_prestart() {
 	%%PREFIX%%/bin/cbsd task mode=flushall > /dev/null 2>&1
 	. ${distdir}/initenv.subr
 	. ${inventory}
 
 	%%PREFIX%%/bin/cbsd sysinv mode=update
 	%%PREFIX%%/bin/cbsd netinv
 	update_netinfo
-	env sqlcolnames="1" ${miscdir}/sqlcli ${dbdir}/local.sqlite "SELECT * FROM local" > ${inventory}
 	${miscdir}/sqlcli ${dbdir}/local.sqlite "UPDATE jails SET status='0' WHERE status='3'"
 	[ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd naton
 	/usr/sbin/daemon -f ${rcddir}/jails-astart start
 }
 
 cbsdd_prestop()
 {
 	${rcddir}/jails-astart stop
 	[ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff
 }
 
 cbsdd_stop()
 {
 	if [ -f "${pidfile}" ]; then
 		pids=$( pgrep -F ${pidfile} 2>&1 )
 		_err=$?
 		if [ ${_err} -eq  0 ]; then
 			kill -9 ${pids} && /bin/rm -f ${pidfile}
 		else
 			echo "pgrep: ${pids}"
 			return ${_err}
 		fi
 	fi
 }
 
 cbsdd_restart()
 {
 	if [ -f "${pidfile}" ]; then
 		pkill -9 -f ${pidfile} > /dev/null 2>&1
 		/bin/rm -f ${pidfile}
 	fi
 	run_rc_command "start"
 	exit 0
 }
 
 cbsdd_status()
 {
 	local _err
 
 	if [ -f "${pidfile}" ]; then
 		pids=$( pgrep -F ${pidfile} 2>&1 )
 		_err=$?
 		if [ ${_err} -eq  0 ]; then
 			echo "${name} is running as pid ${pids}."
 		else
 			echo "pgrep: ${pids}"
 			return ${_err}
 		fi
 	else
 		echo "${name} is not running."
 		return 1
 	fi
 }
 
 run_rc_command "$1"