Skip to content

Commit 71e385e

Browse files
authored
Merge pull request #13 from metalefty/issue/513
vm.8: corrections, other changes
2 parents 2a844e2 + 64c2556 commit 71e385e

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

vm.8

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -239,17 +239,17 @@ The first and second lines are required to enable the
239239
utility.
240240
Please see the
241241
.Cm startall
242-
command description for more information on the third and fourth settings.
242+
subcommand description for more information on the third and fourth settings.
243243
.Pp
244244
Now run the
245245
.Nm vm
246246
.Cm init
247-
command to finish initialisation.
247+
subcommand to finish initialisation.
248248
This will create subdirectories inside
249249
.Pa $vm_dir
250250
to hold configuration and templates.
251251
It will also load any required kernel modules.
252-
This command needs to be run on each boot, which is normally handled by the
252+
This subcommand needs to be run on each boot, which is normally handled by the
253253
rc.d script.
254254
.Pp
255255
Sample templates are installed to
@@ -306,7 +306,7 @@ The
306306
subcommand will immediately return you to your shell.
307307
Once started, use the
308308
.Ar console
309-
command to connect to the guest and complete the installation.
309+
subcommand to connect to the guest and complete the installation.
310310
.Bd -literal -offset ident
311311
# vm create my-guest
312312
# vm install my-guest FreeBSD-10.1-RELEASE-amd64-disc1.iso
@@ -335,7 +335,8 @@ You will also need a copy of the UEFI firmware.
335335
This can either be installed using the
336336
.Pa sysutils/edk2
337337
port, or you can manually download a copy (see URL below) to
338-
.Pa $vm_dir/.config/BHYVE_UEFI.fd and configure a guest to use it by setting
338+
.Pa $vm_dir/.config/BHYVE_UEFI.fd
339+
and configure a guest to use it by setting
339340
.Sy loader="uefi-custom" .
340341
.Pp
341342
If you are running
@@ -358,7 +359,7 @@ See the configuration format documentation below for more detailed information
358359
on configuring graphics.
359360
If network drivers are required, I recommend re-running the
360361
.Sy vm install
361-
command once the guest has been installed, but providing an ISO of the
362+
subcommand once the guest has been installed, but providing an ISO of the
362363
virtio-net drivers instead.
363364
.Pp
364365
Once the installation ISO is ready, has been placed in the
@@ -398,10 +399,10 @@ Show the version number of vm-bhyve installed.
398399
.br
399400
This should be run once after each host reboot before running any other
400401
.Nm
401-
commands.
402+
subcommand.
402403
The main function of the
403404
.Cm init
404-
command is as follows:
405+
subcommand is as follows:
405406
.Pp
406407
o Load all necessary kernel modules if not already loaded
407408
.br
@@ -433,7 +434,7 @@ If the virtual switches are loaded, it also tries to display the
433434
.Xr bridge 4
434435
interface that has been assigned to each one.
435436
.It Cm switch info Op Ar name Op Ar ...
436-
This command shows detailed information about the specified virtual switch(es).
437+
This subcommand shows detailed information about the specified virtual switch(es).
437438
If no switch names are provided, information is output for all configured
438439
switches.
439440
Information displayed includes the following:
@@ -629,7 +630,7 @@ Create a new virtual machine.
629630
Unless specified, the
630631
.Pa default.conf
631632
template will be used and a 20GB virtual disk image is created.
632-
This command will create the virtual machine directory
633+
This subcommand will create the virtual machine directory
633634
.Pa $vm_dir/$name ,
634635
and create the configuration file and empty disk image within.
635636
.Bl -tag -width 12n
@@ -699,7 +700,7 @@ subcommand described below.
699700
By default the installation is started in the background.
700701
Use the
701702
.Ar console
702-
command to connect and begin the installation.
703+
subcommand to connect and begin the installation.
703704
.Pp
704705
After installation, the guest can be rebooted and will restart using its own
705706
disk image to boot.
@@ -840,7 +841,7 @@ used if the guest
840841
can not be shut down using normal methods.
841842
.It Cm startall
842843
Start all virtual machines configured for auto-start.
843-
This is the command used by the rc.d scripts to start all machines on boot.
844+
This subcommand is used by the rc.d scripts to start all machines on boot.
844845
.Pp
845846
The list of virtual machines should be specified using the
846847
.Pa $vm_list
@@ -868,14 +869,14 @@ or not.
868869
.It Cm configure Ar name
869870
The
870871
.Cm configure
871-
command simply opens the virtual machine configuration file in your default
872+
subcommand simply opens the virtual machine configuration file in your default
872873
editor, allowing you to easily make changes.
873874
Please note, changes do not take effect until the virtual machine is fully
874875
shutdown and restarted.
875876
.It Cm passthru
876877
The
877878
.Cm passthru
878-
command lists all PCI devices in the system, the device ID required for bhyve,
879+
subcommand lists all PCI devices in the system, the device ID required for bhyve,
879880
and whether the device is currently ready to be used by a guest.
880881
In order to make a device ready, it needs to be reserved on boot by adding the
881882
device ID to the
@@ -911,7 +912,7 @@ Please note that this function requires ZFS.
911912
.Ar name|name@snapshot
912913
.Xc
913914
Create a snapshot of the names virtual machine.
914-
This command is only supported with ZFS and will take a snapshot of the guest
915+
This subcommand is only supported with ZFS and will take a snapshot of the guest
915916
dataset and any descendant ZVOL devices.
916917
.Pp
917918
The guest and snapshot name can be specified in the normal
@@ -955,7 +956,7 @@ The guest must always be stopped to use this command.
955956
.Op Fl d Ar datastore
956957
.Ar guest host
957958
.Xc
958-
The migrate command allows transferring a guest from one host to another. Note that
959+
The migrate subcommand allows transferring a guest from one host to another. Note that
959960
currently this involves shutting down the guest, and optionally restarting it once
960961
migration is complete.
961962
.Pp
@@ -1037,10 +1038,10 @@ List available images.
10371038
Any virtual machine can be packaged into an image, which can then be used to
10381039
create additional machines.
10391040
All images have a globally unique ID (UUID) which is used to identify them.
1040-
The list command shows the UUID, the original machine name, the date it was
1041+
The list subcommand shows the UUID, the original machine name, the date it was
10411042
created and a short description of the image.
10421043
.Pp
1043-
Please note that these commands rely on using ZFS features to package/unpackage
1044+
Please note that these subcommands rely on using ZFS features to package/unpackage
10441045
the images, and as such are only available when using a ZFS dataset as the
10451046
storage location.
10461047
.It Xo
@@ -1348,7 +1349,7 @@ will default to creating a 20G image for each disk, unless an alternative size
13481349
is specified using this option.
13491350
The size of the first disk can be overridden using the
13501351
.Sy -s
1351-
command line option.
1352+
option.
13521353
.Pp
13531354
NOTE: This setting is only supported in templates.
13541355
It has no function in real guest configuration, and is not copied over when a
@@ -1397,7 +1398,7 @@ If no install commands are specified,
13971398
.Sy grub-bhyve
13981399
will be run on the guests console, so you can use the standard
13991400
.Pa vm console
1400-
command to access the bootloader if needed.
1401+
subcommand to access the bootloader if needed.
14011402
.It grub_run_partition
14021403
Specify the partition that grub should look in for the grub configuration
14031404
files.
@@ -1414,7 +1415,7 @@ If no boot commands are specified,
14141415
.Sy grub-bhyve
14151416
will be run on the guests console, so you can use the standard
14161417
.Pa vm console
1417-
command to access the bootloader if needed.
1418+
subcommand to access the bootloader if needed.
14181419
.Pp
14191420
The sample templates contain examples of how the grub configuration variables
14201421
can be used.
@@ -1484,7 +1485,7 @@ Specify the resolution of the graphical console in
14841485
.Pa WxH
14851486
format.
14861487
Please note that only a certain range of resolutions are currently supported.
1487-
Please set
1488+
Please see
14881489
.Pa config.sample
14891490
for a full up-to-date list.
14901491
.It graphics_wait

0 commit comments

Comments
 (0)