summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/virt-manager/PKGBUILD10
-rw-r--r--libre/virt-manager/libre.patch452
2 files changed, 74 insertions, 388 deletions
diff --git a/libre/virt-manager/PKGBUILD b/libre/virt-manager/PKGBUILD
index 0e6135cab..f84200cd4 100644
--- a/libre/virt-manager/PKGBUILD
+++ b/libre/virt-manager/PKGBUILD
@@ -5,10 +5,12 @@
# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
# Contributor: André Silva <emulatorman@hyperbola.info>
# Contributor: grizzlyuser <grizzlyuser@protonmail.com>
+# Contributor: bill-auger <bill-auger@programmer.net>
# parabola changes and rationale
-# - remove documentation and explicit support for non-FSDG-fit operating systems
+# - replace documentation usage examples with FSDG-fit operating systems
+# - remove explicit support for non-FSDG-fit operating systems
pkgbase=virt-manager
@@ -22,15 +24,17 @@ license=('GPL')
makedepends=('python-docutils')
checkdepends=('python-pytest' 'libosinfo' 'libvirt-python' 'python-gobject' 'python-requests' 'cpio' 'cdrtools')
source=("https://virt-manager.org/download/sources/virt-manager/virt-manager-$pkgver.tar.gz")
-source+=('libre.patch')
+source+=('libre.patch' 'libre-docs.patch')
b2sums=('729a16ee419cfc9f118e4a59336e961f17f38908ab3aaa3598c83bff3e8bca75b150f0f38b021c5ccb839a7c43e87f071859f68c2a81425715e236e14d0a7929')
-b2sums+=('c4b8369bfc78a0603e511a772a2570b84cafdc1cbac553ed9995bb18cdf7259835bb19d1e3120e49f86e19db9b6eb577cf75c3527cfad855c616acd09b3de048')
+b2sums+=('379d25a508a361dfa204ff79b16e92120d7860c00c19877606e44ed0f689cec8813e7704d8f2d51e680523f03cecd78334da70f0455d20a50246c77467fc6a05'
+ 'ca82cbc21fd520d4253940ec37299771486958885425ecf15571e77be63ac0dad7c780b161248a00d6566fc5f33a49d4fc65459f37f75ee9576575c451e1ce37')
prepare() {
cd $pkgbase-$pkgver
patch -p1 -i ../libre.patch
+ patch -p1 -i ../libre-docs.patch
}
build() {
diff --git a/libre/virt-manager/libre.patch b/libre/virt-manager/libre.patch
index 54a3dc43b..aee38213e 100644
--- a/libre/virt-manager/libre.patch
+++ b/libre/virt-manager/libre.patch
@@ -1,377 +1,19 @@
-diff --git a/man/virt-install.rst b/man/virt-install.rst
-index 963f956..a7a4b0a 100644
---- a/man/virt-install.rst
-+++ b/man/virt-install.rst
-@@ -625,20 +625,6 @@ DIRECTORY
- boot, so the OS installer will need another way to access the rest of the
- install media.
-
--Some distro specific url samples:
--
--Fedora/Red Hat Based
-- https://download.fedoraproject.org/pub/fedora/linux/releases/29/Server/x86_64/os
--
--Debian
-- https://ftp.us.debian.org/debian/dists/stable/main/installer-amd64/
--
--Ubuntu
-- https://us.archive.ubuntu.com/ubuntu/dists/wily/main/installer-amd64/
--
--Suse
-- https://download.opensuse.org/pub/opensuse/distribution/leap/42.3/repo/oss/
--
- Additionally, --location can take 'kernel' and 'initrd' sub options. These paths
- relative to the specified location URL/ISO that allow selecting specific files
- for kernel/initrd within the install tree. This can be useful if virt-install/
-@@ -702,21 +688,12 @@ command has multiple subarguments, similar to --disk and friends. This
- option is strictly for VM install operations, essentially configuring the
- first boot.
-
--The simplest usage to ex: install fedora29 is:
--
--.. code-block::
--
-- --install fedora29
--
--And virt-install will fetch a --location URL from libosinfo, and populate
--defaults from there.
--
- Available suboptions:
-
- ``os=``
-- This is os install option described above. The explicit way to specify that
-- would be ``--install os=fedora29`` . os= is the default option if none is
-- specified
-+ This is os install option for virt-install to fetch a --location URL from
-+ libosinfo for specified OS name, and populate defaults from there. os= is
-+ the default option if none is specified.
-
- ``kernel=``, ``initrd=``
- Specify a kernel and initrd pair to use as install media. They are copied
-@@ -784,19 +761,7 @@ 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
--
--.. code-block::
--
-- --cdrom /path/to/my/windows.iso --unattended
-+distros. The simplest invocation is to combine it with --install.
-
- Sub options are:
-
-@@ -827,9 +792,6 @@ Sub options are:
- Note that only the first line of the file will be considered, including
- any whitespace characters and excluding new-line.
-
--``product-key=``
-- Set a Windows product key
--
-
-
- ``--cloud-init``
-@@ -971,21 +933,19 @@ 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
--options is HIGHLY RECOMMENDED, as it can greatly increase performance
--by specifying virtio among other guest tweaks.
-+Optimize the guest configuration for a specific operating system.
-+While not required, specifying this options is HIGHLY RECOMMENDED, as
-+it can greatly increase performance by specifying virtio among other
-+guest tweaks.
-
--The simplest usage is ``--os-variant OS-NAME``, for example
--``--os-variant fedora32``. ``--os-variant`` supports explicit suboption
--syntax as well:
-+The simplest usage is ``--os-variant OS-NAME``. ``--os-variant`` supports
-+explicit suboption syntax as well:
-
- ``name=``, ``short-id=``
-- The OS name/short-id from libosinfo. Examples: ``fedora32``, ``win10``
-+ The OS name/short-id from libosinfo.
-
- ``id=``
-- The full URL style libosinfo ID. For example, ``name=win10`` is
-- the same as ``id=http://microsoft.com/win/10``
-+ The full URL style libosinfo ID.
-
- ``detect=on|off``
- Whether virt-install should attempt OS detection from the specified
-@@ -1157,7 +1117,7 @@ Some example device configuration suboptions:
- "stop", "ignore", or "enospace"
-
- ``serial``
-- Serial number of the emulated disk device. This is used in linux guests
-+ Serial number of the emulated disk device. This is used in GNU/Linux guests
- to set /dev/disk/by-id symlinks. An example serial number might be:
- WD-WMAP9A966149
-
-@@ -1185,7 +1145,7 @@ invocation is:
-
- --filesystem /source/on/host,/target/point/in/guest
-
--Which will work for recent QEMU and linux guest OS or LXC containers. For
-+Which will work for recent QEMU and GNU/Linux guest OS or LXC containers. For
- QEMU, the target point is just a mounting hint in sysfs, so will not be
- automatically mounted.
-
-@@ -2052,69 +2012,6 @@ The debugging information is also stored in
- EXAMPLES
- ========
-
--The simplest invocation to interactively install a Fedora 29 KVM VM
--with recommended defaults. virt-viewer(1) will be launched to
--graphically interact with the VM install
--
--.. code-block::
--
-- # sudo virt-install --install fedora29
--
--
--
--Similar, but use libosinfo's unattended install support, which will
--perform the fedora29 install automatically without user intervention:
--
--.. code-block::
--
-- # sudo virt-install --install fedora29 --unattended
--
--
--
--Install a Windows 10 VM, using 40GiB storage in the default location
--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 \
-- --memory 4096 \
-- --disk size=40 \
-- --os-variant win10 \
-- --cdrom /path/to/my/win10.iso
--
--
--
--Install a CentOS 7 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:
--
--.. code-block::
--
-- # virt-install \
-- --connect qemu:///system \
-- --memory 8192 \
-- --vcpus 8 \
-- --graphics vnc \
-- --os-variant centos7.0 \
-- --location http://mirror.centos.org/centos-7/7/os/x86_64/
--
--
--
--Create a VM around an existing debian9 disk image:
--
--.. code-block::
--
-- # virt-install \
-- --import \
-- --memory 512 \
-- --disk /home/user/VMs/my-debian9.img \
-- --os-variant debian9
--
--
--
- Start serial QEMU ARM VM, which requires specifying a manual kernel.
-
- .. code-block::
-diff --git a/man/virt-xml.rst b/man/virt-xml.rst
-index 7ff7cec..9d9dcd5 100644
---- a/man/virt-xml.rst
-+++ b/man/virt-xml.rst
-@@ -181,10 +181,9 @@ GUEST OS OPTIONS
- ================
-
- ``--os-variant``, ``--osinfo`` OS_VARIANT
-- Optimize the guest configuration for a specific operating system (ex.
-- 'fedora29', 'rhel7', 'win10'). While not required, specifying this
-- options is HIGHLY RECOMMENDED, as it can greatly increase performance
-- by specifying virtio among other guest tweaks.
-+ Optimize the guest configuration for a specific operating system. While not
-+ required, specifying this options is HIGHLY RECOMMENDED, as it can greatly
-+ increase performance by specifying virtio among other guest tweaks.
-
- If the guest has been installed using virt-manager version 2.0.0 or newer,
- providing this information should not be necessary, as the OS variant will
-@@ -299,34 +298,6 @@ Change the <description> of domain 'EXAMPLE':
- # virt-xml EXAMPLE --edit --boot menu=on
-
-
--Clear the previous <cpu> definition of domain 'winxp', change it to 'host-model', but interactively confirm the diff before saving:
--
--.. code-block::
--
-- # virt-xml winxp --edit --cpu host-model,clearxml=yes --confirm
--
--
--Change the second sound card to model=ich6 on 'fedora19', but only output the diff:
--
--.. code-block::
--
-- # virt-xml fedora19 --edit 2 --sound model=ich6 --print-diff
--
--
--Update the every graphics device password to 'foo' of the running VM 'rhel6':
--
--.. code-block::
--
-- # virt-xml rhel6 --edit all --graphics password=foo --update
--
--
--Remove the disk path from disk device hdc:
--
--.. code-block::
--
-- # virt-xml rhel6 --edit target=hdc --disk path=
--
--
- Change all disk devices of type 'disk' to use cache=none, using XML from stdin, printing the new XML to stdout.
-
- .. code-block::
-@@ -334,67 +305,6 @@ Change all disk devices of type 'disk' to use cache=none, using XML from stdin,
- # cat <xmlfile> | virt-xml --edit device=disk --disk cache=none
-
-
--Change disk 'hda' IO to native and use startup policy as 'optional'.
--
--.. code-block::
--
-- # virt-xml fedora20 --edit target=hda \
-- --disk io=native,startup_policy=optional
--
--
--Change all host devices to use driver_name=vfio for VM 'fedora20' on the remote connection
--
--.. code-block::
--
-- # virt-xml --connect qemu+ssh://remotehost/system \
-- fedora20 --edit all --hostdev driver_name=vfio
--
--
--Hotplug host USB device 001.003 to running domain 'fedora19':
--
--.. code-block::
--
-- # virt-xml fedora19 --update --add-device --hostdev 001.003
--
--
--Add a spicevmc channel to the domain 'winxp', that will be available after the next VM shutdown.
--
--.. code-block::
--
-- # virt-xml winxp --add-device --channel spicevmc
--
--
--Create a 10G qcow2 disk image and attach it to 'fedora18' for the next VM startup:
--
--.. code-block::
--
-- # virt-xml fedora18 --add-device \
-- --disk /var/lib/libvirt/images/newimage.qcow2,format=qcow2,size=10
--
--
--Same as above, but ensure the disk is attached to the most appropriate bus
--for the guest OS by providing information about it on the command line:
--
--.. code-block::
--
-- # virt-xml fedora18 --os-variant fedora18 --add-device \
-- --disk /var/lib/libvirt/images/newimage.qcow2,format=qcow2,size=10
--
--
--Hotunplug the disk vdb from the running domain 'rhel7':
--
--.. code-block::
--
-- # virt-xml rhel7 --update --remove-device --disk target=vdb
--
--
--Remove all graphics devices from the VM 'rhel7' after the next shutdown:
--
--.. code-block::
--
-- # virt-xml rhel7 --remove-device --graphics all
--
--
- Generate XML for a virtio console device and print it to stdout:
+diff --git a/virtManager/oslist.py b/virtManager/oslist.py
+index 8796c96..9786fad 100644
+--- a/virtManager/oslist.py
++++ b/virtManager/oslist.py
+@@ -53,6 +53,11 @@ class vmmOSList(vmmGObjectUI):
+ os_list_model = Gtk.ListStore(object, str)
- .. code-block::
-diff --git a/virtinst/osdict.py b/virtinst/osdict.py
-index 3be1d10..0debfa7 100644
---- a/virtinst/osdict.py
-+++ b/virtinst/osdict.py
-@@ -132,49 +132,7 @@ class _OSDB(object):
- # This is only for back compatibility with pre-libosinfo support.
- # This should never change.
- _aliases = {
-- "altlinux": "altlinux1.0",
-- "debianetch": "debian4",
-- "debianlenny": "debian5",
-- "debiansqueeze": "debian6",
-- "debianwheezy": "debian7",
-- "freebsd10": "freebsd10.0",
-- "freebsd6": "freebsd6.0",
-- "freebsd7": "freebsd7.0",
-- "freebsd8": "freebsd8.0",
-- "freebsd9": "freebsd9.0",
-- "mandriva2009": "mandriva2009.0",
-- "mandriva2010": "mandriva2010.0",
-- "mbs1": "mbs1.0",
-- "msdos": "msdos6.22",
-- "openbsd4": "openbsd4.2",
-- "opensolaris": "opensolaris2009.06",
-- "opensuse11": "opensuse11.4",
-- "opensuse12": "opensuse12.3",
-- "rhel4": "rhel4.0",
-- "rhel5": "rhel5.0",
-- "rhel6": "rhel6.0",
-- "rhel7": "rhel7.0",
-- "ubuntuhardy": "ubuntu8.04",
-- "ubuntuintrepid": "ubuntu8.10",
-- "ubuntujaunty": "ubuntu9.04",
-- "ubuntukarmic": "ubuntu9.10",
-- "ubuntulucid": "ubuntu10.04",
-- "ubuntumaverick": "ubuntu10.10",
-- "ubuntunatty": "ubuntu11.04",
-- "ubuntuoneiric": "ubuntu11.10",
-- "ubuntuprecise": "ubuntu12.04",
-- "ubuntuquantal": "ubuntu12.10",
-- "ubunturaring": "ubuntu13.04",
-- "ubuntusaucy": "ubuntu13.10",
-- "virtio26": "fedora10",
-- "vista": "winvista",
-- "winxp64": "winxp",
--
- # Old --os-type values
-- "linux": "generic",
-- "windows": "winxp",
-- "solaris": "solaris10",
-- "unix": "freebsd9.0",
- "other": "generic",
- }
+ all_os = virtinst.OSDB.list_os()
++ all_os = [os for os in all_os if os.name in [ 'generic' , \
++ 'parabola' , \
++ 'pureos' , \
++ 'trisquel8' , \
++ 'trisquel9' ] ]
+ for os in all_os:
+ os_list_model.append([os, "%s (%s)" % (os.label, os.name)])
diff --git a/virtinst/install/urldetect.py b/virtinst/install/urldetect.py
index a73b0bf..1588f0c 100644
--- a/virtinst/install/urldetect.py
@@ -925,17 +567,57 @@ index a73b0bf..1588f0c 100644
# Always stick GenericDistro at the end, since it's a catchall
_GenericTreeinfoDistro,
]
-diff --git a/virtManager/oslist.py b/virtManager/oslist.py
-index 8796c96..05d5d2e 100644
---- a/virtManager/oslist.py
-+++ b/virtManager/oslist.py
-@@ -55,7 +55,8 @@ class vmmOSList(vmmGObjectUI):
- all_os = virtinst.OSDB.list_os()
-
- for os in all_os:
-- os_list_model.append([os, "%s (%s)" % (os.label, os.name)])
-+ if os.name == "generic":
-+ os_list_model.append([os, "%s (%s)" % (os.label, os.name)])
+diff --git a/virtinst/osdict.py b/virtinst/osdict.py
+index 3be1d10..3be0747 100644
+--- a/virtinst/osdict.py
++++ b/virtinst/osdict.py
+@@ -132,49 +132,8 @@ class _OSDB(object):
+ # This is only for back compatibility with pre-libosinfo support.
+ # This should never change.
+ _aliases = {
+- "altlinux": "altlinux1.0",
+- "debianetch": "debian4",
+- "debianlenny": "debian5",
+- "debiansqueeze": "debian6",
+- "debianwheezy": "debian7",
+- "freebsd10": "freebsd10.0",
+- "freebsd6": "freebsd6.0",
+- "freebsd7": "freebsd7.0",
+- "freebsd8": "freebsd8.0",
+- "freebsd9": "freebsd9.0",
+- "mandriva2009": "mandriva2009.0",
+- "mandriva2010": "mandriva2010.0",
+- "mbs1": "mbs1.0",
+- "msdos": "msdos6.22",
+- "openbsd4": "openbsd4.2",
+- "opensolaris": "opensolaris2009.06",
+- "opensuse11": "opensuse11.4",
+- "opensuse12": "opensuse12.3",
+- "rhel4": "rhel4.0",
+- "rhel5": "rhel5.0",
+- "rhel6": "rhel6.0",
+- "rhel7": "rhel7.0",
+- "ubuntuhardy": "ubuntu8.04",
+- "ubuntuintrepid": "ubuntu8.10",
+- "ubuntujaunty": "ubuntu9.04",
+- "ubuntukarmic": "ubuntu9.10",
+- "ubuntulucid": "ubuntu10.04",
+- "ubuntumaverick": "ubuntu10.10",
+- "ubuntunatty": "ubuntu11.04",
+- "ubuntuoneiric": "ubuntu11.10",
+- "ubuntuprecise": "ubuntu12.04",
+- "ubuntuquantal": "ubuntu12.10",
+- "ubunturaring": "ubuntu13.04",
+- "ubuntusaucy": "ubuntu13.10",
+- "virtio26": "fedora10",
+- "vista": "winvista",
+- "winxp64": "winxp",
+-
+ # Old --os-type values
+ "linux": "generic",
+- "windows": "winxp",
+- "solaris": "solaris10",
+- "unix": "freebsd9.0",
+ "other": "generic",
+ }
- model_filter = Gtk.TreeModelFilter(child_model=os_list_model)
- model_filter.set_visible_func(self._filter_os_cb)
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 02:57:43 +0000