Deleted Added
full compact
vmrun.sh (270754) vmrun.sh (271447)
1#!/bin/sh
2#
3# Copyright (c) 2013 NetApp, Inc.
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
1#!/bin/sh
2#
3# Copyright (c) 2013 NetApp, Inc.
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/share/examples/bhyve/vmrun.sh 270754 2014-08-28 16:26:13Z rodrigc $
27# $FreeBSD: head/share/examples/bhyve/vmrun.sh 271447 2014-09-12 02:38:10Z rodrigc $
28#
29
30LOADER=/usr/sbin/bhyveload
31BHYVECTL=/usr/sbin/bhyvectl
32FBSDRUN=/usr/sbin/bhyve
33
34DEFAULT_MEMSIZE=512M
35DEFAULT_CPUS=2

--- 155 unchanged lines hidden (view full) ---

191
192 if [ $force_install -eq 1 -o $need_install -eq 1 ]; then
193 if [ ! -r ${isofile} ]; then
194 echo -n "Installation CDROM image \"${isofile}\" "
195 echo "is not readable"
196 exit 1
197 fi
198 BOOTDISK=${isofile}
28#
29
30LOADER=/usr/sbin/bhyveload
31BHYVECTL=/usr/sbin/bhyvectl
32FBSDRUN=/usr/sbin/bhyve
33
34DEFAULT_MEMSIZE=512M
35DEFAULT_CPUS=2

--- 155 unchanged lines hidden (view full) ---

191
192 if [ $force_install -eq 1 -o $need_install -eq 1 ]; then
193 if [ ! -r ${isofile} ]; then
194 echo -n "Installation CDROM image \"${isofile}\" "
195 echo "is not readable"
196 exit 1
197 fi
198 BOOTDISK=${isofile}
199 installer_opt="-s 31:0,virtio-blk,${BOOTDISK}"
199 installer_opt="-s 31:0,ahci-cd,${BOOTDISK}"
200 else
201 BOOTDISK=${virtio_diskdev}
202 installer_opt=""
203 fi
204
205 ${LOADER} -c ${console} -m ${memsize} -d ${BOOTDISK} ${loader_opt} \
206 ${vmname}
207 if [ $? -ne 0 ]; then

--- 47 unchanged lines hidden ---
200 else
201 BOOTDISK=${virtio_diskdev}
202 installer_opt=""
203 fi
204
205 ${LOADER} -c ${console} -m ${memsize} -d ${BOOTDISK} ${loader_opt} \
206 ${vmname}
207 if [ $? -ne 0 ]; then

--- 47 unchanged lines hidden ---