Merge pull request #111 from metalefty/1.7-stable

Release v1.7.2

Author: metalefty

Makefile

@@ -20,6 +20,7 @@ MAN=$(PROG).8
 install:
 	$(MKDIR) -p $(BINDIR)
 	$(INSTALL) -m 544 $(PROG) $(BINDIR)/
+	sed -i '' -e 's|/usr/local/lib/vm-bhyve|$(LIBDIR)|g' $(BINDIR)/$(PROG)
 
 	$(MKDIR) -p $(LIBDIR)
 	$(INSTALL) lib/* $(LIBDIR)/

README.md

@@ -43,9 +43,9 @@ See the sections below for more in-depth details.
     6. cp /usr/local/share/examples/vm-bhyve/* /mountpoint/for/pool/vm/.templates/
     7. vm switch create public
     8. vm switch add public em0
-    9. vm iso https://download.freebsd.org/ftp/releases/ISO-IMAGES/14.2/FreeBSD-14.2-RELEASE-amd64-bootonly.iso
+    9. vm iso https://download.freebsd.org/ftp/releases/ISO-IMAGES/14.3/FreeBSD-14.3-RELEASE-amd64-bootonly.iso
     10. vm create myguest
-    11. vm install [-f] myguest FreeBSD-14.2-RELEASE-amd64-bootonly.iso
+    11. vm install [-f] myguest FreeBSD-14.3-RELEASE-amd64-bootonly.iso
     12. vm console myguest
 
 - [ ] Line 1
@@ -187,17 +187,17 @@ example specifies the templatename.conf template, and tells vm-bhyve to create a
 
 You will need an ISO to install the guest with, so download one using the iso command:
 
-    # vm iso https://download.freebsd.org/ftp/releases/ISO-IMAGES/14.2/FreeBSD-14.2-RELEASE-amd64-disc1.iso
+    # vm iso https://download.freebsd.org/ftp/releases/ISO-IMAGES/14.3/FreeBSD-14.3-RELEASE-amd64-disc1.iso
 
 To start a guest install, run the following command. vm-bhyve will run the machine in the background,
 so use the console command to connect to it and finish installation.
 
-    # vm install testvm FreeBSD-14.2-RELEASE-amd64-disc1.iso
+    # vm install testvm FreeBSD-14.3-RELEASE-amd64-disc1.iso
     # vm console testvm
 
 You can also specify the foreground option to run the guest directly on your terminal:
 
-    # vm install -f testvm FreeBSD-14.2-RELEASE-amd64-disc1.iso
+    # vm install -f testvm FreeBSD-14.3-RELEASE-amd64-disc1.iso
 
 Once installation has finished, you can reboot the guest from inside the console and it will boot up into
 the new OS (assuming installation was successful). Further reboots will work as expected and
@@ -259,8 +259,8 @@ To use this feature you'll need install qemu-tools package:
 
 To launch FreeBSD using official cloud image:
 
-    # vm img https://download.freebsd.org/ftp/releases/VM-IMAGES/14.2-RELEASE/amd64/Latest/FreeBSD-14.2-RELEASE-amd64.raw.xz
-    # vm create -t freebsd-zvol -i FreeBSD-14.2-RELEASE-amd64.raw freebsd-cloud
+    # vm img https://download.freebsd.org/ftp/releases/VM-IMAGES/14.3-RELEASE/amd64/Latest/FreeBSD-14.3-RELEASE-amd64.raw.xz
+    # vm create -t freebsd-zvol -i FreeBSD-14.3-RELEASE-amd64.raw freebsd-cloud
     # vm start freebsd-cloud
 
 To list downloaded images:
@@ -270,7 +270,7 @@ To list downloaded images:
     default             CentOS-7-x86_64-GenericCloud-20180930_02.raw
     default             debian-9-openstack-amd64.qcow2
     default             Fedora-AtomicHost-28-1.1.x86_64.raw
-    default             FreeBSD-14.2-RELEASE-amd64.raw
+    default             FreeBSD-14.3-RELEASE-amd64.raw
     default             xenial-server-cloudimg-amd64-uefi1.img
 
 ## Using cloud-init

lib/vm-base

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 # SPDX-FileCopyrightText: 2018 Matt Churchyard <churchers@gmail.com>
 
-VERSION=1.7.1
+VERSION=1.7.2
 VERSION_BSD=$(uname -K)
 PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin
 

lib/vm-core

@@ -1280,10 +1280,13 @@ core::configure(){
 # @param string _url if specified, the url will be fetch'ed into $vm_dir/.iso
 #
 core::iso(){
-    local _url _ds="default"
+    local _url _ds="default" _filename
+    local _fetch_opts
 
-    while getopts d:u _opt ; do
+    while getopts 46d:u _opt ; do
         case $_opt in
+            4) _fetch_opts="${_fetch_opts} -4" ;;
+            6) _fetch_opts="${_fetch_opts} -6" ;;
             d) _ds=${OPTARG} ;;
             *) util::usage ;;
         esac
@@ -1294,7 +1297,11 @@ core::iso(){
 
     if [ -n "${_url}" ]; then
         datastore::get_iso "${_ds}" || util::err "unable to locate path for datastore '${_ds}'"
-        fetch -o "${VM_DS_PATH}" "${_url}"
+        # Essentially, -4 and -6 are mutually exclusive, but fetch(1) does not enforce it.
+        # The last one wins, so leaving it to fetch(1).
+        fetch ${_fetch_opts} -o "${VM_DS_PATH}" "${_url}"
+        _filename=$(basename "${_url}")
+        core::decompress "${VM_DS_PATH}/${_filename}"
     else
         datastore::iso_list
     fi
@@ -1329,12 +1336,15 @@ core::decompress(){
 #
 core::img(){
     local _url _ds="default" _filename
+    local _fetch_opts
     if ! which qemu-img > /dev/null; then
         util::err "Error: qemu-img is required to work with cloud images! Run 'pkg install qemu-tools'."
     fi
 
-    while getopts d:u _opt ; do
+    while getopts 46d:u _opt ; do
         case $_opt in
+            4) _fetch_opts="${_fetch_opts} -4" ;;
+            6) _fetch_opts="${_fetch_opts} -6" ;;
             d) _ds=${OPTARG} ;;
             *) util::usage ;;
         esac
@@ -1346,7 +1356,9 @@ core::img(){
     if [ -n "${_url}" ]; then
         datastore::get_img "${_ds}" || util::err "unable to locate path for datastore '${_ds}'"
         _filename=$(basename "${_url}")
-        fetch -o "${VM_DS_PATH}" "${_url}"
+        # Essentially, -4 and -6 are mutually exclusive, but fetch(1) does not enforce it.
+        # The last one wins, so leaving it to fetch(1).
+        fetch ${_fetch_opts} -o "${VM_DS_PATH}" "${_url}"
         core::decompress "${VM_DS_PATH}/${_filename}"
     else
         datastore::img_list

lib/vm-util

@@ -198,8 +198,8 @@ Usage: vm ...
     clone <name[@snapshot]> <new-name>
     snapshot [-f] <name[@snapshot]>
     rollback [-r] <name@snapshot>
-    iso [url]
-    img [url]
+    iso [-46] [url]
+    img [-46[ [url]
     image list
     image create [-d description] [-u] <name>
     image destroy <uuid>

vm.8

@@ -183,10 +183,12 @@
 .Pp
 .Nm
 .Cm iso
+.Op Fl 46
 .Op Ar -d datastore
 .Op Ar url
 .Nm
 .Cm img
+.Op Fl 46
 .Op Ar -d datastore
 .Op Ar url
 .Pp
@@ -1144,6 +1146,7 @@ This snapshot must exist on both hosts.
 .El
 .It Xo
 .Cm iso
+.Op Fl 46
 .Op Ar -d datastore
 .Op Ar url
 .Xc
@@ -1163,8 +1166,14 @@ The target datasource can be changed by specifying
 .Sy -d datastore
 with
 .Sy url .
+Use the
+.Sy -4
+or
+.Sy -6
+option to specify the IP address family for downloads.
 .It Xo
 .Cm img
+.Op Fl 46
 .Op Ar -d datastore
 .Op Ar url
 .Xc
@@ -1184,6 +1193,11 @@ The target datastore can be changed by specifying
 .Sy -d datastore
 with
 .Sy url .
+Use the
+.Sy -4
+or
+.Sy -6
+option to specify the IP address family for downloads.
 .It Cm image list
 List available images.
 Any virtual machine can be packaged into an image, which can then be used to
@@ -1340,7 +1354,7 @@ which can be achieved using the
 .Sy none
 value.
 .It fwcfg
-This option allows you to specify the fwcfg interface.
+This option allows you to specify the fw_cfg interface.
 The valid options are
 .Sy bhyve ,
 or