summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/virt-manager/PKGBUILD19
-rw-r--r--libre/virt-manager/libre.patch287
2 files changed, 130 insertions, 176 deletions
diff --git a/libre/virt-manager/PKGBUILD b/libre/virt-manager/PKGBUILD
index c6b04e734..d820a04f3 100644
--- a/libre/virt-manager/PKGBUILD
+++ b/libre/virt-manager/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer (Arch): Christian Rebischke <chris.rebischke@archlinux.org>
+# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor (Arch): Daniel Micay <danielmicay@gmail.com>
# Contributor (Arch): Jonathan Wiersma <archaur at jonw dot org>
# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
@@ -6,20 +7,20 @@
pkgbase=virt-manager
pkgname=(virt-install)
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
pkgrel+=.par1
pkgdesc="Console user interface for managing virtual machines"
pkgdesc+=", without non-FSDG compliant distros and operating systems support"
arch=('any')
-url="http://virt-manager.org/"
+url="https://virt-manager.org/"
license=('GPL')
depends=('libosinfo' 'libvirt-python' 'python-gobject' 'python-requests')
makedepends=('intltool')
source=("https://virt-manager.org/download/sources/virt-manager/virt-manager-$pkgver.tar.gz"
'libre.patch')
-sha512sums=('48590ff58246e13b73c7ab741ca854bfebae27fb90a891168db5d3fac1d066cce603f83b8d993e70e387624f911fc8503abe488e7992bc50f49d7e980aed5afb'
- 'cb7cfcf9cf46db8edb2fcdf7fe21b203de811fdc81aa3cf990febba89ebb0cf53cc27b44171df2d979afa187dcdefb1f256fda67a37a2dbde4c23866cc1a9839')
+sha512sums=('09975f7628ee302687eb6572b5f35797b4710aaae60c17542ee9edd72c65e80e93d7bbc7a2050667a9280effdbab28272886ae155b3ba73c104153ae3c048d99'
+ '8858c3994da18cf704a5d4a715708ccb39d6e16e89890b7207709f2c5227abc03355d79172ed05ae8837d91b841f3c0d1b533e5bf56756c645192d20f36ffd80')
prepare() {
cd "$srcdir/$pkgbase-$pkgver"
@@ -41,7 +42,7 @@ package_virt-install() {
[[ -d $srcdir/virt-manager ]] && rm -r "$srcdir/virt-manager/"
mkdir "$srcdir"/virt-manager
mv "$pkgdir"/usr/bin/virt-manager \
- "$pkgdir"/usr/share/{appdata,applications,glib-2.0,icons}/ \
- "$pkgdir"/usr/share/man/man1/virt-manager.1 \
- "$srcdir/virt-manager/"
+ "$pkgdir"/usr/share/{appdata,applications,glib-2.0,icons}/ \
+ "$pkgdir"/usr/share/man/man1/virt-manager.1 \
+ "$srcdir/virt-manager/"
}
diff --git a/libre/virt-manager/libre.patch b/libre/virt-manager/libre.patch
index 300037400..dd7b6ac7a 100644
--- a/libre/virt-manager/libre.patch
+++ b/libre/virt-manager/libre.patch
@@ -1,7 +1,6 @@
-diff -Naur virt-manager-2.0.0.orig/man/virt-install.pod virt-manager-2.0.0/man/virt-install.pod
---- virt-manager-2.0.0.orig/man/virt-install.pod 2018-10-13 13:26:55.000000000 -0500
-+++ virt-manager-2.0.0/man/virt-install.pod 2018-10-19 17:18:38.584887172 -0500
-@@ -10,7 +10,7 @@ B<virt-install> [OPTION]...
+--- virt-manager-2.2.0.orig/man/virt-install.pod 2019-06-17 00:20:11.000000000 -0500
++++ virt-manager-2.2.0/man/virt-install.pod 2019-06-22 22:24:40.692771325 -0500
+@@ -10,7 +10,7 @@
=head1 DESCRIPTION
@@ -10,7 +9,7 @@ diff -Naur virt-manager-2.0.0.orig/man/virt-install.pod virt-manager-2.0.0/man/v
container guests using the C<libvirt> hypervisor management library.
See the EXAMPLES section at the end of this document to quickly get started.
-@@ -67,7 +67,7 @@ For connecting to Xen.
+@@ -70,7 +70,7 @@
=item lxc:///
@@ -19,7 +18,7 @@ diff -Naur virt-manager-2.0.0.orig/man/virt-install.pod virt-manager-2.0.0/man/v
=back
-@@ -396,36 +396,6 @@ Path to a local directory containing an
+@@ -455,28 +455,6 @@
=back
@@ -43,20 +42,12 @@ diff -Naur virt-manager-2.0.0.orig/man/virt-install.pod virt-manager-2.0.0/man/v
-
-https://download.opensuse.org/pub/opensuse/distribution/leap/42.3/repo/oss/
-
--=item Mandriva
--
--ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2009.0/i586/
--
--=item Mageia
--
--ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/1
--
-=back
-
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/
-@@ -563,10 +533,9 @@ Use --idmap=? to see a list of all avail
+@@ -719,10 +697,9 @@
=item B<--os-variant> OS_VARIANT
@@ -70,16 +61,7 @@ diff -Naur virt-manager-2.0.0.orig/man/virt-install.pod virt-manager-2.0.0/man/v
By default, virt-install will attempt to auto detect this value from
the install media (currently only supported for URL installs). Autodetection
-@@ -651,7 +620,7 @@ bus types.
-
- =item B<removable>
-
--Sets the removable flag (/sys/block/$dev/removable on Linux). Only
-+Sets the removable flag (/sys/block/$dev/removable on GNU/Linux). Only
- used with QEMU and bus=usb. Value can be 'on' or 'off'.
-
- =item B<readonly>
-@@ -731,7 +700,7 @@ How guest should react if a write error
+@@ -891,7 +868,7 @@
=item B<serial>
@@ -88,7 +70,7 @@ diff -Naur virt-manager-2.0.0.orig/man/virt-install.pod virt-manager-2.0.0/man/v
to set /dev/disk/by-id symlinks. An example serial number might be:
WD-WMAP9A966149
-@@ -760,7 +729,7 @@ invocation is:
+@@ -923,7 +900,7 @@
--filesystem /source/on/host,/target/point/in/guest
@@ -97,88 +79,80 @@ diff -Naur virt-manager-2.0.0.orig/man/virt-install.pod virt-manager-2.0.0/man/v
QEMU, the target point is just a mounting hint in sysfs, so will not be
automatically mounted.
-@@ -1728,46 +1697,7 @@ C<~/.cache/virt-manager/virt-install.log
+@@ -1796,49 +1773,6 @@
=head1 EXAMPLES
--Install a Fedora 29 KVM guest with virtio accelerated disk/network,
--creating a new 10GiB qcow2 file, installing from media in the hosts
--CDROM drive. This will use Spice graphics by default, and launch autolaunch
--a graphical client.
+-The simplest invocation to interactively install a Fedora 29 KVM VM
+-with recommended defaults. L<virt-viewer(1)> will be launched to
+-graphically interact with the VM install
+-
+- # sudo virt-install --install fedora29
+-
+-Similar, but use libosinfo's unattended install support, which will
+-perform the fedora29 install automatically without user intervention:
+-
+- # 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:
-
- # virt-install \
-- --connect qemu:///system \
-- --virt-type kvm \
-- --name demo \
-- --memory 500 \
-- --disk size=10 \
-- --cdrom /dev/cdrom \
-- --os-variant fedora29
+- --connect qemu:///system \
+- --name my-win10-vm \
+- --memory 4096 \
+- --disk size=40 \
+- --os-variant win10 \
+- --cdrom /path/to/my/win10.iso
-
--Install a Fedora 9 plain QEMU guest, using LVM partition, virtual networking,
--booting from PXE, using VNC server/viewer, with virtio-scsi disk
+-Install a CentOS 7 KVM from a URL, with recommended device defaults and
+-default required storag,e but specifically request VNC graphics instead
+-of the default SPICE, and request 8 virtual CPUs and 8192 MiB of memory:
-
- # virt-install \
- --connect qemu:///system \
-- --name demo \
-- --memory 500 \
-- --disk path=/dev/HostVG/DemoVM,bus=scsi \
-- --controller virtio-scsi \
-- --network network=default \
-- --virt-type qemu \
+- --memory 8192 \
+- --vcpus 8 \
- --graphics vnc \
-- --os-variant fedora9
+- --os-variant centos7.0 \
+- --location http://mirror.centos.org/centos-7/7/os/x86_64/
-
--Run a Live CD image under Xen fullyvirt, in diskless environment
+-Create a VM around an existing debian9 disk image:
-
- # virt-install \
-- --hvm \
-- --name demo \
-- --memory 500 \
-- --disk none \
-- --livecd \
-- --graphics vnc \
-- --cdrom /root/fedora7live.iso
+- --import \
+- --memory 512 \
+- --disk /home/user/VMs/my-debian9.img \
+- --os-variant debian9
-
--Run /usr/bin/httpd in a linux container guest (LXC). Resource usage is capped
-+Run /usr/bin/httpd in a GNU/Linux container guest (LXC). Resource usage is capped
- at 512 MiB of ram and 2 host cpus:
+ Start serial QEMU ARM VM, which requires specifying a manual kernel.
# virt-install \
-@@ -1777,7 +1707,7 @@ at 512 MiB of ram and 2 host cpus:
- --vcpus 2 \
- --init /usr/bin/httpd
-
--Start a linux container guest(LXC) with a private root filesystem,
-+Start a GNU/Linux container guest(LXC) with a private root filesystem,
- using /bin/sh as init.
- Container's root will be under host dir /home/LXC.
- The host dir "/home/test" will be mounted at
-@@ -1792,7 +1722,7 @@ The host dir "/home/test" will be mounte
- --init /bin/sh
-
- Install a paravirtualized Xen guest, 500 MiB of RAM, a 5 GiB of disk, and
--Fedora Core 6 from a web server, in text-only mode, with old style --file
-+Parabola GNU/Linux-libre from a web server, in text-only mode, with old style --file
- options:
+--- virt-manager-2.2.0.orig/man/virt-xml.pod 2019-06-17 00:20:11.000000000 -0500
++++ virt-manager-2.2.0/man/virt-xml.pod 2019-06-22 22:31:26.052767093 -0500
+@@ -176,10 +176,9 @@
- # virt-install \
-@@ -1801,7 +1731,7 @@ options:
- --memory 500 \
- --disk /var/lib/xen/images/demo.img,size=6 \
- --graphics none \
-- --location https://download.fedora.redhat.com/pub/fedora/linux/core/6/x86_64/os/
-+ --location https://repo.parabola.nu/iso/latest/
-
- Create a guest from an existing disk image 'mydisk.img' using defaults for
- the rest of the options.
-diff -Naur virt-manager-2.0.0.orig/man/virt-xml.pod virt-manager-2.0.0/man/virt-xml.pod
---- virt-manager-2.0.0.orig/man/virt-xml.pod 2018-10-13 13:26:55.000000000 -0500
-+++ virt-manager-2.0.0/man/virt-xml.pod 2018-10-19 18:35:08.954722971 -0500
-@@ -316,59 +316,10 @@
-
- # virt-xml winxp --edit --cpu host-model,clearxml=yes --confirm
+ =item B<--os-variant> 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
+@@ -342,63 +341,10 @@
+
+ # 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:
+-
+- # 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:
-
- # virt-xml fedora19 --edit 2 --sound model=ich6 --print-diff
@@ -235,10 +209,9 @@ diff -Naur virt-manager-2.0.0.orig/man/virt-xml.pod virt-manager-2.0.0/man/virt-
Generate XML for a virtio console device and print it to stdout:
# virt-xml --build-xml --console pty,target_type=virtio
-diff -Naur virt-manager-2.0.0.orig/virtinst/osdict.py virt-manager-2.0.0/virtinst/osdict.py
---- virt-manager-2.0.0.orig/virtinst/osdict.py 2018-10-13 13:59:42.000000000 -0500
-+++ virt-manager-2.0.0/virtinst/osdict.py 2018-10-19 19:37:17.687104677 -0500
-@@ -98,49 +98,7 @@
+--- virt-manager-2.2.0.orig/virtinst/osdict.py 2019-06-17 00:20:11.000000000 -0500
++++ virt-manager-2.2.0/virtinst/osdict.py 2019-06-22 22:35:02.212764836 -0500
+@@ -124,49 +124,7 @@
# This is only for back compatibility with pre-libosinfo support.
# This should never change.
_aliases = {
@@ -288,10 +261,9 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/osdict.py virt-manager-2.0.0/virtins
"other": "generic",
}
-diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virtinst/urldetect.py
---- virt-manager-2.0.0.orig/virtinst/urldetect.py 2018-10-13 13:26:55.000000000 -0500
-+++ virt-manager-2.0.0/virtinst/urldetect.py 2018-10-19 19:44:14.306556502 -0500
-@@ -157,110 +157,6 @@
+--- virt-manager-2.2.0.orig/virtinst/install/urldetect.py 2019-06-17 00:20:11.000000000 -0500
++++ virt-manager-2.2.0/virtinst/install/urldetect.py 2019-06-22 22:43:13.122759711 -0500
+@@ -173,109 +173,6 @@
return True
@@ -309,12 +281,11 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
- if line.startswith(prefix + " "):
- self.content_dict[prefix] = line.split(" ", 1)[1]
-
-- logging.debug("SUSE content dict: %s", str(self.content_dict))
--
+- log.debug("SUSE content dict: %s", self.content_dict)
- self.tree_arch = self._get_tree_arch()
- self.product_name = self._get_product_name()
- self.product_version = self._get_product_version()
-- logging.debug("SUSE content product_name=%s product_version=%s "
+- log.debug("SUSE content product_name=%s product_version=%s "
- "tree_arch=%s", self.product_name, self.product_version,
- self.tree_arch)
-
@@ -360,7 +331,7 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
- elif "," in self.content_dict.get("DISTRO", ""):
- product_name = self.content_dict["DISTRO"].rsplit(",", 1)[1]
-
-- logging.debug("SUSE content product_name=%s", product_name)
+- log.debug("SUSE content product_name=%s", product_name)
- return product_name
-
- def _get_product_version(self):
@@ -400,10 +371,10 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
-
-
def getDistroStore(guest, fetcher, skip_error):
- logging.debug("Finding distro store for location=%s", fetcher.location)
+ log.debug("Finding distro store for location=%s", fetcher.location)
-@@ -386,418 +282,6 @@ class _DistroTree(object):
- return self._os_variant
+@@ -388,403 +285,6 @@
+ return self.cache.libosinfo_mediaobj
-class _FedoraDistro(_DistroTree):
@@ -419,14 +390,14 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
- latest_variant = "fedora-unknown"
-
- verstr = self.cache.treeinfo_version
-- if not verstr:
-- logging.debug("No treeinfo version? Assume latest_variant=%s",
+- if not verstr: # pragma: no cover
+- log.debug("No treeinfo version? Assume latest_variant=%s",
- latest_variant)
- return latest_variant
-
- # rawhide trees changed to use version=Rawhide in Apr 2016
- if verstr in ["development", "rawhide", "Rawhide"]:
-- logging.debug("treeinfo version=%s, using latest_variant=%s",
+- log.debug("treeinfo version=%s, using latest_variant=%s",
- verstr, latest_variant)
- return latest_variant
-
@@ -435,9 +406,10 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
- if OSDB.lookup_os(variant):
- return variant
-
-- logging.debug("variant=%s from treeinfo version=%s not found, "
+- log.debug( # pragma: no cover
+- "variant=%s from treeinfo version=%s not found, "
- "using latest_variant=%s", variant, verstr, latest_variant)
-- return latest_variant
+- return latest_variant # pragma: no cover
-
-
-class _RHELDistro(_DistroTree):
@@ -455,7 +427,7 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
-
- def _detect_version(self):
- if not self.cache.treeinfo_version:
-- logging.debug("No treeinfo version? Not setting an os_variant")
+- log.debug("No treeinfo version? Not setting an os_variant")
- return
-
- version, update = self.cache.split_version()
@@ -504,13 +476,13 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
- try:
- cache.suse_content = _SUSEContent(content_str)
- except Exception as e:
-- logging.debug("Error parsing SUSE content file: %s", str(e))
+- log.debug("Error parsing SUSE content file: %s", str(e))
- return False
-
- if not cache.suse_content:
- return False
- for regex in cls._suse_regex:
-- if re.match(regex, cache.suse_content.product_name):
+- if re.match(regex, cache.suse_content.product_name or ""):
- return True
- return False
-
@@ -533,10 +505,13 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
- ("boot/%s/vmlinuz-xen" % tree_arch,
- "boot/%s/initrd-xen" % tree_arch))
-
-- if (tree_arch == "s390x" and
-- str(self._os_variant).startswith(("sles11", "sled11"))):
-- self._kernel_paths.append(
-- ("boot/s390x/vmrdr.ikr", "boot/s390x/initrd"))
+- if str(self._os_variant).startswith(("sles11", "sled11")):
+- if tree_arch == "s390x":
+- self._kernel_paths.append(
+- ("boot/s390x/vmrdr.ikr", "boot/s390x/initrd"))
+- if tree_arch == "ppc64":
+- self._kernel_paths.append(
+- ("suseboot/linux64", "suseboot/initrd64"))
-
- # Tested with SLES 12 for ppc64le, all s390x
- self._kernel_paths.append(
@@ -687,7 +662,7 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
- arch = re.findall(pattern, self.uri)
- if not arch:
- continue
-- logging.debug("Found pattern=%s treearch=%s in uri",
+- log.debug("Found pattern=%s treearch=%s in uri",
- pattern, arch[0])
- return arch[0]
-
@@ -695,14 +670,14 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
- # in the URI name for --location $ISO mounts
- for arch in ["i386", "amd64", "x86_64", "arm64"]:
- if arch in self.uri:
-- logging.debug("Found treearch=%s in uri", arch)
+- log.debug("Found treearch=%s in uri", arch)
- if arch == "x86_64":
- arch = "amd64"
- return arch
-
- # Otherwise default to i386
- arch = "i386"
-- logging.debug("No treearch found in uri, defaulting to arch=%s", arch)
+- log.debug("No treearch found in uri, defaulting to arch=%s", arch)
- return arch
-
- def _set_url_paths(self):
@@ -758,7 +733,7 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
- oses = [n for n in OSDB.list_os() if n.name.startswith(self._debname)]
-
- if self.cache.debian_media_type == "daily":
-- logging.debug("Appears to be debian 'daily' URL, using latest "
+- log.debug("Appears to be debian 'daily' URL, using latest "
- "debian OS")
- return oses[0].name
-
@@ -773,7 +748,7 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
- codename = osobj.label.split()[1].lower()
-
- if ("/%s/" % codename) in self.uri:
-- logging.debug("Found codename=%s in the URL string", codename)
+- log.debug("Found codename=%s in the URL string", codename)
- return osobj.name
-
-
@@ -784,64 +759,42 @@ diff -Naur virt-manager-2.0.0.orig/virtinst/urldetect.py virt-manager-2.0.0/virt
- _debname = "ubuntu"
-
-
--class _ALTLinuxDistro(_DistroTree):
-- PRETTY_NAME = "ALT Linux"
-- matching_distros = ["altlinux"]
--
-- def _set_manual_kernel_paths(self):
-- self._kernel_paths = [
-- ("syslinux/alt0/vmlinuz", "syslinux/alt0/full.cz")]
+-class _MageiaDistro(_DistroTree):
+- # https://distro.ibiblio.org/mageia/distrib/cauldron/x86_64/
+- PRETTY_NAME = "Mageia"
+- matching_distros = ["mageia"]
-
- @classmethod
- def is_valid(cls, cache):
-- # altlinux doesn't have installable URLs, so this is just for ISO
-- return cache.content_regex(".disk/info", ".*ALT .*")
--
--
--class _MandrivaDistro(_DistroTree):
-- # ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2007.1/x86_64/
-- PRETTY_NAME = "Mandriva/Mageia"
-- matching_distros = ["mandriva", "mes"]
--
-- @classmethod
-- def is_valid(cls, cache):
-- return cache.content_regex("VERSION", ".*(Mandriva|Mageia).*")
+- return cache.content_regex("VERSION", ".*Mageia.*")
-
- def _set_manual_kernel_paths(self):
-- # At least Mageia 5 uses arch in the names
- self._kernel_paths += [
- ("isolinux/%s/vmlinuz" % self.arch,
- "isolinux/%s/all.rdz" % self.arch)]
-
-- # Kernels for HVM: valid for releases 2007.1, 2008.*, 2009.0
-- self._kernel_paths += [
-- ("isolinux/alt0/vmlinuz", "isolinux/alt0/all.rdz")]
--
-
class _GenericTreeinfoDistro(_DistroTree):
"""
Generic catchall class for .treeinfo using distros
-diff -Naur virt-manager-2.0.0.orig/virtManager/details.py virt-manager-2.0.0/virtManager/details.py
---- virt-manager-2.0.0.orig/virtManager/details.py 2018-10-13 16:15:25.000000000 -0500
-+++ virt-manager-2.0.0/virtManager/details.py 2018-10-19 19:34:11.219743958 -0500
-@@ -344,14 +344,6 @@
-
- def _label_for_os_type(os_type):
- typemap = {
-- "dos": _("MS-DOS/FreeDOS"),
-- "freebsd": _("FreeBSD"),
-- "hurd": _("GNU/Hurd"),
-- "linux": _("Linux"),
-- "minix": _("MINIX"),
-- "netbsd": _("NetBSD"),
-- "openbsd": _("OpenBSD"),
-- "windows": _("Microsoft Windows"),
- }
- try:
- return typemap[os_type]
-diff -Naur virt-manager-2.0.0.orig/virtManager/oslist.py virt-manager-2.0.0/virtManager/oslist.py
---- virt-manager-2.0.0.orig/virtManager/oslist.py 2018-10-13 13:26:55.000000000 -0500
-+++ virt-manager-2.0.0/virtManager/oslist.py 2018-10-20 17:45:29.688394493 -0500
+@@ -824,15 +324,6 @@
+ allstores = [
+ # Libosinfo takes priority
+ _LibosinfoDistro,
+- _FedoraDistro,
+- _RHELDistro,
+- _CentOSDistro,
+- _SLESDistro,
+- _SLEDDistro,
+- _OpensuseDistro,
+- _DebianDistro,
+- _UbuntuDistro,
+- _MageiaDistro,
+ # Always stick GenericDistro at the end, since it's a catchall
+ _GenericTreeinfoDistro,
+ ]
+--- virt-manager-2.2.0.orig/virtManager/oslist.py 2019-06-17 00:20:11.000000000 -0500
++++ virt-manager-2.2.0/virtManager/oslist.py 2019-06-22 22:48:03.832756676 -0500
@@ -55,7 +55,8 @@
all_os = virtinst.OSDB.list_os()