Page MenuHomeFreeBSD
Files F156637864

D2723.id5908.diff
No OneTemporary
Actions

D2723.id5908.diff
View Options

Index: share/examples/bhyve/vmrun.sh
===================================================================
--- share/examples/bhyve/vmrun.sh
+++ share/examples/bhyve/vmrun.sh
@@ -104,7 +104,10 @@
console=${OPTARG}
;;
d)
- eval "disk_dev${disk_total}=\"${OPTARG}\""
+ disk_dev=${OPTARG%%,*}
+ disk_opts=${OPTARG#${disk_dev}}
+ eval "disk_dev${disk_total}=\"${disk_dev}\""
+ eval "disk_opts${disk_total}=\"${disk_opts}\""
disk_total=$(($disk_total + 1))
;;
e)
@@ -183,16 +186,16 @@
echo "Launching virtual machine \"$vmname\" ..."
-virtio_diskdev="$disk_dev0"
+first_diskdev="$disk_dev0"
${BHYVECTL} --vm=${vmname} --destroy > /dev/null 2>&1
while [ 1 ]; do
- file -s ${virtio_diskdev} | grep "boot sector" > /dev/null
+ file -s ${first_diskdev} | grep "boot sector" > /dev/null
rc=$?
if [ $rc -ne 0 ]; then
- file -s ${virtio_diskdev} | grep ": Unix Fast File sys" > /dev/null
+ file -s ${first_diskdev} | grep ": Unix Fast File sys" > /dev/null
rc=$?
fi
if [ $rc -ne 0 ]; then
@@ -207,14 +210,22 @@
echo "is not readable"
exit 1
fi
- BOOTDISK=${isofile}
- installer_opt="-s 31:0,ahci-cd,${BOOTDISK}"
+ BOOTDISKS="-d ${isofile}"
+ installer_opt="-s 31:0,ahci-cd,${isofile}"
else
- BOOTDISK=${virtio_diskdev}
+ BOOTDISKS=""
+ i=0
+ while [ $i -lt $disk_total ] ; do
+ eval "disk=\$disk_dev${i}"
+ if [ -r ${disk} ] ; then
+ BOOTDISKS="$BOOTDISKS -d ${disk} "
+ fi
+ i=$(($i + 1))
+ done
installer_opt=""
fi
- ${LOADER} -c ${console} -m ${memsize} -d ${BOOTDISK} ${loader_opt} \
+ ${LOADER} -c ${console} -m ${memsize} ${BOOTDISKS} ${loader_opt} \
${vmname}
bhyve_exit=$?
if [ $bhyve_exit -ne 0 ]; then
@@ -237,8 +248,9 @@
i=0
while [ $i -lt $disk_total ] ; do
eval "disk=\$disk_dev${i}"
+ eval "opts=\$disk_opts${i}"
make_and_check_diskdev "${disk}"
- devargs="$devargs -s $nextslot:0,virtio-blk,${disk} "
+ devargs="$devargs -s $nextslot:0,virtio-blk,${disk}${opts} "
nextslot=$(($nextslot + 1))
i=$(($i + 1))
done

File Metadata

Mime Type
text/plain
Expires
Sat, May 16, 7:22 AM (9 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33121341
Default Alt Text
D2723.id5908.diff (2 KB)

Event Timeline