From ee11f47ade7aa162bc2f389310533b56122759a7 Mon Sep 17 00:00:00 2001 From: grembo Date: Mon, 16 Nov 2015 19:01:22 +0000 Subject: Fix to start bhyve properly on 10.2. PR: 204111 Approved by: mentors (implicit) --- sysutils/bhyve-rc/Makefile | 2 +- sysutils/bhyve-rc/files/bhyve.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysutils/bhyve-rc/Makefile b/sysutils/bhyve-rc/Makefile index 6c6f83e2bd94..b56851563350 100644 --- a/sysutils/bhyve-rc/Makefile +++ b/sysutils/bhyve-rc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bhyve-rc -PORTVERSION= 2 +PORTVERSION= 3 CATEGORIES= sysutils MASTER_SITES= # none DISTFILES= # none diff --git a/sysutils/bhyve-rc/files/bhyve.in b/sysutils/bhyve-rc/files/bhyve.in index 57bb6ff6ec00..3d187bf7392f 100644 --- a/sysutils/bhyve-rc/files/bhyve.in +++ b/sysutils/bhyve-rc/files/bhyve.in @@ -141,6 +141,6 @@ bhyve_stop() rm -f ${pidfile} } -command_args="new-session -ds ${_session} \"sh -c 'echo \\\$PPID >${pidfile}; while true; do /usr/sbin/bhyvectl --vm=${_session} --destroy; /usr/sbin/bhyveload -m ${bhyve_memsize} -d ${bhyve_diskdev} ${_session} && /usr/sbin/bhyve -c ${bhyve_ncpu} -m ${bhyve_memsize} -AI -H -P -g 0 -s 0:0,hostbridge -s 1:0,virtio-net,${bhyve_tapdev} -s 2:0,virtio-blk,${bhyve_diskdev} -s 31,uart,stdio ${_session} || break; done'\"" +command_args="new-session -ds ${_session} \"sh -c 'echo \\\$PPID >${pidfile}; while true; do /usr/sbin/bhyvectl --vm=${_session} --destroy; /usr/sbin/bhyveload -m ${bhyve_memsize} -d ${bhyve_diskdev} ${_session} && /usr/sbin/bhyve -c ${bhyve_ncpu} -m ${bhyve_memsize} -AI -H -P -g 0 -s 0:0,hostbridge -s 1:0,virtio-net,${bhyve_tapdev} -s 2:0,virtio-blk,${bhyve_diskdev} -s 31,lpc -l com1,stdio ${_session} || break; done'\"" run_rc_command "$1" -- cgit