Attachment 194877 Details for Bug 229515 – 1.2 svn diff

[patch] 1.2 svn diff

vm-bhyve-v1.2.diff (text/plain), 5.09 KB, created by churchers on 2018-07-04 14:31:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: churchers

Created: 2018-07-04 14:31:02 UTC

Size: 5.09 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 473041)
>+++ Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	vm-bhyve
>-PORTVERSION=	1.1.8
>-PORTREVISION=	2
>+PORTVERSION=	1.2.2
> DISTVERSIONPREFIX=v
> CATEGORIES=	sysutils
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 473041)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1496917755
>-SHA256 (churchers-vm-bhyve-v1.1.8_GH0.tar.gz) = 2c716a03a4d94d0867fd081d5dc0abc342d66a23208b606e659d10eed56c3114
>-SIZE (churchers-vm-bhyve-v1.1.8_GH0.tar.gz) = 54985
>+TIMESTAMP = 1530694001
>+SHA256 (churchers-vm-bhyve-v1.2.2_GH0.tar.gz) = b80a0549e0ae3b09fac03f3ba4fdb84a758fc2982d5eb154c6d98be27b1fcc55
>+SIZE (churchers-vm-bhyve-v1.2.2_GH0.tar.gz) = 65186
>Index: files/patch-lib_vm-util
>===================================================================
>--- files/patch-lib_vm-util	(revision 473041)
>+++ files/patch-lib_vm-util	(nonexistent)
>@@ -1,22 +0,0 @@
>---- 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
>- 
>
>Property changes on: files/patch-lib_vm-util
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lib_vm-zfs
>===================================================================
>--- files/patch-lib_vm-zfs	(revision 473041)
>+++ files/patch-lib_vm-zfs	(nonexistent)
>@@ -1,11 +0,0 @@
>---- 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
>
>Property changes on: files/patch-lib_vm-zfs
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 473041)
>+++ pkg-message	(working copy)
>@@ -1,4 +1,4 @@
>-To enable vm-bhyve, please add the following lines to /etc/rc.conf,
>+To enable vm-bhyve, please add the following lines to rc.conf,
> depending on whether you are using ZFS storage or not. Please note
> that the directory or dataset specified should already exist.
> 
>@@ -14,11 +14,7 @@
> 
> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
> 
>-If upgrading from 1.0 or earlier, please note that the 'guest'
>-configuration option is no longer used.
>+Please note, if upgrading from version 1.1, it is advised to shutdown guests
>+and restart the host in order to re-create all virtual switches using new identifiers.
> 
>-Guests that are not using UEFI boot will need either loader="grub"
>-or loader="bhyveload" in their configuration in order to make sure
>-the correct loader is used.
>-
> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 473041)
>+++ pkg-plist	(working copy)
>@@ -5,21 +5,31 @@
> lib/vm-bhyve/vm-datastore
> lib/vm-bhyve/vm-guest
> lib/vm-bhyve/vm-info
>+lib/vm-bhyve/vm-migration
> lib/vm-bhyve/vm-rctl
> lib/vm-bhyve/vm-run
> lib/vm-bhyve/vm-switch
>+lib/vm-bhyve/vm-switch-manual
>+lib/vm-bhyve/vm-switch-standard
>+lib/vm-bhyve/vm-switch-vale
>+lib/vm-bhyve/vm-switch-vxlan
> lib/vm-bhyve/vm-util
> lib/vm-bhyve/vm-zfs
> man/man8/vm.8.gz
> sbin/vm
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alpine.conf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arch.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos6.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos7.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.sample
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coreos.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/default.conf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dragonfly.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/freebsd-zvol.conf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freepbx.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/netbsd.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/openbsd.conf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resflash.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ubuntu.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/windows.conf

Flags:

churchers: maintainer-approval+

Actions: View | Diff

Attachments on bug 229515: 194877