Date: Sat, 23 Dec 2017 09:58:55 +0000 (UTC) From: Dmitry Morozovsky <marck@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457036 - in head/sysutils/vm-bhyve: . files Message-ID: <201712230958.vBN9wtsa078157@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marck (doc committer) Date: Sat Dec 23 09:58:55 2017 New Revision: 457036 URL: https://svnweb.freebsd.org/changeset/ports/457036 Log: Merge 2 useful diffs from the dev tree: - compatibility with verbose boot - proper treatment for undefined vm_dir PR: 222496 Approved by: maintainer-timeout (since 20170921) Added: head/sysutils/vm-bhyve/files/ head/sysutils/vm-bhyve/files/patch-lib_vm-util (contents, props changed) head/sysutils/vm-bhyve/files/patch-lib_vm-zfs (contents, props changed) Modified: head/sysutils/vm-bhyve/Makefile Modified: head/sysutils/vm-bhyve/Makefile ============================================================================== --- head/sysutils/vm-bhyve/Makefile Sat Dec 23 09:55:08 2017 (r457035) +++ head/sysutils/vm-bhyve/Makefile Sat Dec 23 09:58:55 2017 (r457036) @@ -2,6 +2,7 @@ PORTNAME= vm-bhyve PORTVERSION= 1.1.8 +PORTREVISION= 1 DISTVERSIONPREFIX=v CATEGORIES= sysutils Added: head/sysutils/vm-bhyve/files/patch-lib_vm-util ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/vm-bhyve/files/patch-lib_vm-util Sat Dec 23 09:58:55 2017 (r457036) @@ -0,0 +1,22 @@ +--- lib/vm-util.orig ++++ lib/vm-util +@@ -55,7 +55,7 @@ + # @modifies VM_NO_UG + # + util::check_bhyve_support(){ +- local _mesg _result ++ local _mesg _mesg1 _mesg2 _result + + # basic checks + [ `id -u` -ne 0 ] && util::err "virtual machines can only be managed by root" +@@ -73,7 +73,9 @@ + fi + + # check ept for intel +- _mesg=$(grep -E '^[ ]+VT-x' /var/run/dmesg.boot | tail -n 1) ++ _mesg1=$(grep -E '^[ ]+VT-x' /var/run/dmesg.boot | tail -n 1) ++ _mesg2=$(grep -E '^[ ]+Secondary Processor Controls' /var/run/dmesg.boot | tail -n 1) ++ _mesg="${_mesg1}${_mesg2}" + + if [ -n "${_mesg}" ]; then + Added: head/sysutils/vm-bhyve/files/patch-lib_vm-zfs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/vm-bhyve/files/patch-lib_vm-zfs Sat Dec 23 09:58:55 2017 (r457036) @@ -0,0 +1,11 @@ +--- lib/vm-zfs.orig ++++ lib/vm-zfs +@@ -45,7 +45,7 @@ + + # check for zfs storage location + # user should specify "zfs:pool/dataset" if they want ZFS support +- if [ ${vm_dir%%:*} = "zfs" ]; then ++ if [ "${vm_dir%%:*}" = "zfs" ]; then + + # check zfs running + kldstat -qm zfs >/dev/null 2>&1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712230958.vBN9wtsa078157>