diff options
Diffstat (limited to 'libre/virt-manager/libre-docs.patch')
| -rw-r--r-- | libre/virt-manager/libre-docs.patch | 161 |
1 files changed, 78 insertions, 83 deletions
diff --git a/libre/virt-manager/libre-docs.patch b/libre/virt-manager/libre-docs.patch index b25476c3d..bff5b24d3 100644 --- a/libre/virt-manager/libre-docs.patch +++ b/libre/virt-manager/libre-docs.patch @@ -1,18 +1,18 @@ diff --git a/man/virt-install.rst b/man/virt-install.rst -index 963f956..f762237 100644 +index 3a6e8dc..078f859 100644 --- a/man/virt-install.rst +++ b/man/virt-install.rst -@@ -627,17 +627,11 @@ DIRECTORY +@@ -647,17 +647,11 @@ DIRECTORY Some distro specific url samples: -Fedora/Red Hat Based - https://download.fedoraproject.org/pub/fedora/linux/releases/29/Server/x86_64/os +Parabola GNU/Linux-libre -+ https://redirector.parabola.nu/iso/x86_64-mini-latest ++ https://redirector.parabola.nu/iso/parabola-2021.08.11/parabola-2021.08.11-dual.iso -Debian -- https://ftp.us.debian.org/debian/dists/stable/main/installer-amd64/ +- https://debian.osuosl.org/debian/dists/stable/main/installer-amd64/ - -Ubuntu - https://us.archive.ubuntu.com/ubuntu/dists/wily/main/installer-amd64/ @@ -20,11 +20,11 @@ index 963f956..f762237 100644 -Suse - https://download.opensuse.org/pub/opensuse/distribution/leap/42.3/repo/oss/ +Trisquel -+ http://mirror.fsf.org/trisquel-images/trisquel-mini_8.0_amd64.iso ++ https://mirror.fsf.org/trisquel-images/trisquel_10.0.1_amd64.iso Additionally, --location can take 'kernel' and 'initrd' sub options. These paths relative to the specified location URL/ISO that allow selecting specific files -@@ -702,11 +696,11 @@ command has multiple subarguments, similar to --disk and friends. This +@@ -722,11 +716,11 @@ command has multiple subarguments, similar to --disk and friends. This option is strictly for VM install operations, essentially configuring the first boot. @@ -38,7 +38,7 @@ index 963f956..f762237 100644 And virt-install will fetch a --location URL from libosinfo, and populate defaults from there. -@@ -715,7 +709,7 @@ Available suboptions: +@@ -735,7 +729,7 @@ Available suboptions: ``os=`` This is os install option described above. The explicit way to specify that @@ -47,29 +47,29 @@ index 963f956..f762237 100644 specified ``kernel=``, ``initrd=`` -@@ -784,19 +778,11 @@ device will be added. +@@ -804,19 +798,11 @@ device will be added. Perform an unattended install using libosinfo's install script support. This is essentially a database of auto install scripts for various -distros: Red Hat kickstarts, Debian installer scripting, Windows -unattended installs, and potentially others. The simplest invocation -is to combine it with --install like: +- +-.. code-block:: +- +- --install fedora29 --unattended +- +-A Windows install will look like +distros. The simplest invocation is to combine it with --install. .. code-block:: -- --install fedora29 --unattended -- --A Windows install will look like -- --.. code-block:: -- - --cdrom /path/to/my/windows.iso --unattended + --install parabola --unattended Sub options are: -@@ -827,9 +813,6 @@ Sub options are: +@@ -847,9 +833,6 @@ Sub options are: Note that only the first line of the file will be considered, including any whitespace characters and excluding new-line. @@ -79,23 +79,16 @@ index 963f956..f762237 100644 ``--cloud-init`` -@@ -972,20 +955,20 @@ GUEST OS OPTIONS - **Syntax:** ``--os-variant`` [OS_VARIANT|OPT1=VAL1,...] - - Optimize the guest configuration for a specific operating system (ex. --'fedora29', 'rhel7', 'win10'). While not required, specifying this -+'parabola', 'trisquel8'). While not required, specifying this - options is HIGHLY RECOMMENDED, as it can greatly increase performance - by specifying virtio among other guest tweaks. +@@ -1005,14 +988,14 @@ For most cases, an OS must be specified or detected from the install + media so performance critical features like virtio can be enabled. - The simplest usage is ``--os-variant OS-NAME``, for example --``--os-variant fedora32``. ``--os-variant`` supports explicit suboption -+``--os-variant systemd-cli``. ``--os-variant`` supports explicit suboption - syntax as well: + The simplest usage is ``--os-variant OSNAME`` or ``--osinfo OSNAME``, +-for example ``--osinfo fedora32``. The supported suboptions are: ++for example ``--osinfo parabola``. The supported suboptions are: ``name=``, ``short-id=`` - The OS name/short-id from libosinfo. Examples: ``fedora32``, ``win10`` -+ The OS name/short-id from libosinfo. Examples: ``parabola``, ``trisquel8`` ++ The OS name/short-id from libosinfo. Examples: ``parabola`` ``id=`` - The full URL style libosinfo ID. For example, ``name=win10`` is @@ -105,7 +98,16 @@ index 963f956..f762237 100644 ``detect=on|off`` Whether virt-install should attempt OS detection from the specified -@@ -1157,7 +1140,7 @@ Some example device configuration suboptions: +@@ -1061,7 +1044,7 @@ STORAGE OPTIONS + ``--disk`` + ^^^^^^^^^^ + +-**Syntax:** ``--disk`` OPTIONS ++````Syntax:** ``--disk`` OPTIONS + + Specifies media to use as storage for the guest, with various options. The + general format of a disk string is +@@ -1190,7 +1173,7 @@ Some example device configuration suboptions: "stop", "ignore", or "enospace" ``serial`` @@ -114,7 +116,7 @@ index 963f956..f762237 100644 to set /dev/disk/by-id symlinks. An example serial number might be: WD-WMAP9A966149 -@@ -1185,7 +1168,7 @@ invocation is: +@@ -1218,7 +1201,7 @@ invocation is: --filesystem /source/on/host,/target/point/in/guest @@ -123,7 +125,7 @@ index 963f956..f762237 100644 QEMU, the target point is just a mounting hint in sysfs, so will not be automatically mounted. -@@ -2052,26 +2035,26 @@ The debugging information is also stored in +@@ -2125,66 +2108,22 @@ The debugging information is also stored in EXAMPLES ======== @@ -146,63 +148,56 @@ index 963f956..f762237 100644 .. code-block:: - # sudo virt-install --install fedora29 --unattended -+ # sudo virt-install --install parabola --unattended - - - +- +- +- -Install a Windows 10 VM, using 40GiB storage in the default location -+Install a Parabola VM, using 40GiB storage in the default location - and 4096MiB of ram, and ensure we are connecting to the system libvirtd - instance: - -@@ -2079,15 +2062,15 @@ instance: - - # virt-install \ - --connect qemu:///system \ +-and 4096MiB of ram, and ensure we are connecting to the system libvirtd +-instance: +- +-.. code-block:: +- +- # virt-install \ +- --connect qemu:///system \ - --name my-win10-vm \ -+ --name my-parabola-vm \ - --memory 4096 \ - --disk size=40 \ -- --os-variant win10 \ +- --memory 4096 \ +- --disk size=40 \ +- --osinfo win10 \ - --cdrom /path/to/my/win10.iso -+ --os-variant parabola \ -+ --cdrom /path/to/parabola.iso - - - +- +- +- -Install a CentOS 7 KVM from a URL, with recommended device defaults and -+Install a Parabola KVM from a URL, with recommended device defaults and - default required storage, but specifically request VNC graphics instead - of the default SPICE, and request 8 virtual CPUs and 8192 MiB of memory: - -@@ -2098,20 +2081,20 @@ of the default SPICE, and request 8 virtual CPUs and 8192 MiB of memory: - --memory 8192 \ - --vcpus 8 \ - --graphics vnc \ -- --os-variant centos7.0 \ +-default required storage, but specifically request VNC graphics instead +-of the default SPICE, and request 8 virtual CPUs and 8192 MiB of memory: +- +-.. code-block:: +- +- # virt-install \ +- --connect qemu:///system \ +- --memory 8192 \ +- --vcpus 8 \ +- --graphics vnc \ +- --osinfo centos7.0 \ - --location http://mirror.centos.org/centos-7/7/os/x86_64/ -+ --os-variant systemd-cli \ -+ --location https://redirector.parabola.nu/iso/x86_64-systemd-cli-latest - - - +- +- +- -Create a VM around an existing debian9 disk image: -+Create a VM around an existing Parabola disk image: - - .. code-block:: - - # virt-install \ - --import \ - --memory 512 \ +- +-.. code-block:: +- +- # virt-install \ +- --import \ +- --memory 512 \ - --disk /home/user/VMs/my-debian9.img \ -- --os-variant debian9 -+ --disk /path/to/parabola.img \ -+ --os-variant systemd-cli +- --osinfo debian9 ++ # sudo virt-install --install parabola --unattended diff --git a/man/virt-xml.rst b/man/virt-xml.rst -index 7ff7cec..b4313f7 100644 +index ddd586b..102743a 100644 --- a/man/virt-xml.rst +++ b/man/virt-xml.rst @@ -182,7 +182,7 @@ GUEST OS OPTIONS @@ -210,11 +205,11 @@ index 7ff7cec..b4313f7 100644 ``--os-variant``, ``--osinfo`` OS_VARIANT Optimize the guest configuration for a specific operating system (ex. - 'fedora29', 'rhel7', 'win10'). While not required, specifying this -+ 'parabola', 'trisquel8'). While not required, specifying this ++ 'parabola', 'trisquel'). While not required, specifying this options is HIGHLY RECOMMENDED, as it can greatly increase performance by specifying virtio among other guest tweaks. -@@ -299,32 +299,32 @@ Change the <description> of domain 'EXAMPLE': +@@ -312,32 +312,32 @@ Change the <description> of domain 'EXAMPLE': # virt-xml EXAMPLE --edit --boot menu=on @@ -254,7 +249,7 @@ index 7ff7cec..b4313f7 100644 Change all disk devices of type 'disk' to use cache=none, using XML from stdin, printing the new XML to stdout. -@@ -338,37 +338,37 @@ Change disk 'hda' IO to native and use startup policy as 'optional'. +@@ -351,37 +351,37 @@ Change disk 'hda' IO to native and use startup policy as 'optional'. .. code-block:: @@ -301,12 +296,12 @@ index 7ff7cec..b4313f7 100644 --disk /var/lib/libvirt/images/newimage.qcow2,format=qcow2,size=10 -@@ -377,22 +377,22 @@ for the guest OS by providing information about it on the command line: +@@ -390,22 +390,22 @@ for the guest OS by providing information about it on the command line: .. code-block:: -- # virt-xml fedora18 --os-variant fedora18 --add-device \ -+ # virt-xml parabola --os-variant systemd-cli --add-device \ +- # virt-xml fedora18 --osinfo fedora18 --add-device \ ++ # virt-xml parabola --osinfo parabola --add-device \ --disk /var/lib/libvirt/images/newimage.qcow2,format=qcow2,size=10 |