From 920a4f9712eb2278e0047f7e2e61ae7da61d25f9 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Wed, 10 Apr 2024 01:39:21 -0700 Subject: [PATCH] doc/VirtualMachine.md: Vagrant is no longer experimental --- doc/README.md | 6 +++--- doc/VirtualMachine.md | 13 ++++--------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/doc/README.md b/doc/README.md index e0be2885..b3753d49 100644 --- a/doc/README.md +++ b/doc/README.md @@ -321,15 +321,15 @@ * [Virtual Machine](VirtualMachine.md#virtual-machine) * [Installation methods](VirtualMachine.md#installation-methods) - * [libvirt and QEMU (recommended)](VirtualMachine.md#libvirt-and-qemu-recommended) - * [Vagrant (experimental)](VirtualMachine.md#vagrant-experimental) + * [libvirt and QEMU](VirtualMachine.md#libvirt-and-qemu) + * [Vagrant](VirtualMachine.md#vagrant) * [Host vs guest](VirtualMachine.md#host-vs-guest) * [Environment variables](VirtualMachine.md#environment-variables) * [Initial virtual machine set-up](VirtualMachine.md#initial-virtual-machine-set-up) * [Prerequisites](VirtualMachine.md#prerequisites) * [CPU Virtualization Technology](VirtualMachine.md#cpu-virtualization-technology) * [KVM](VirtualMachine.md#kvm) - * [libvirt and QEMU](VirtualMachine.md#libvirt-and-qemu) + * [libvirt and QEMU](VirtualMachine.md#libvirt-and-qemu-1) * [Make a pbot-vm user or directory](VirtualMachine.md#make-a-pbot-vm-user-or-directory) * [Add libvirt group to your user](VirtualMachine.md#add-libvirt-group-to-your-user) * [Download Linux ISO](VirtualMachine.md#download-linux-iso) diff --git a/doc/VirtualMachine.md b/doc/VirtualMachine.md index cb2f45b0..e6e95040 100644 --- a/doc/VirtualMachine.md +++ b/doc/VirtualMachine.md @@ -5,7 +5,7 @@ system commands and code. ## Installation methods -### libvirt and QEMU (recommended) +### libvirt and QEMU This document will guide you through installing and configuring a Linux virtual machine on a Linux host by using the widely available [libvirt](https://libvirt.org) project tools, such as `virt-install`, `virsh`, and `virt-viewer`. @@ -13,15 +13,10 @@ project tools, such as `virt-install`, `virsh`, and `virt-viewer`. Additionally, if you'd prefer not to use libvirt, this guide will also demonstrate equivalent Linux system commands and QEMU commands. -### Vagrant (experimental) +### Vagrant A much simpler and easier method to install the virtual machine is to use the Vagrant virtual machine -management and provisioning framework. Under the [pbot-vm/vagrant/](../applets/pbot-vm/vagrant) directory -I have created a few `Vagrantfile` VM configuration and provisioning scripts. - -These scripts are currently highly experimental and some pbot-vm features are not yet fully implemented, -such as snapshotting and disabling the network. However, if you want to quickly test out the PBot -virtual machine with just a couple of simple easy commands, read the [PBot Vagrant guide](../applets/pbot-vm/vagrant/README.md) -instead. +management and provisioning framework. To install the PBot virtual machine with just a couple of simple +easy commands, read the [PBot Vagrant guide](../applets/pbot-vm/vagrant/README.md) instead. ## Host vs guest * `host`: your physical Linux system hosting the virtual machine