f88a913443
* Slim down filesystem device editor UI * Fix TOCTTOU virt-install bugs (Martin Pitt) * Several other bug fixes virt-manager-3.2.0.tar.bz2 - Drop patches contained in new tarball 1a1e4580-cloner-Explicitly-reject-network-disks-we-dont-know-how-to-clone.patch 2773bc35-storagepool-cleanup-volumes-on-pool-cleanup.patch b1328202-devices-disk-Skip-check_path_search-for-path.patch virtman-append-usr-sbin-to-search-path.patch - Upstream bug fixes (bsc#1027942) 1a1e4580-cloner-Explicitly-reject-network-disks-we-dont-know-how-to-clone.patch 2773bc35-storagepool-cleanup-volumes-on-pool-cleanup.patch b1328202-devices-disk-Skip-check_path_search-for-path.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=525
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
References: fate#326960, bsc#1123942
|
|
|
|
Index: virt-manager-3.2.0/virtinst/install/installer.py
|
|
===================================================================
|
|
--- virt-manager-3.2.0.orig/virtinst/install/installer.py
|
|
+++ virt-manager-3.2.0/virtinst/install/installer.py
|
|
@@ -604,7 +604,10 @@ class Installer(object):
|
|
guest.bootloader = "pygrub"
|
|
else:
|
|
guest.bootloader = None
|
|
- self._treemedia_bootconfig = ("/usr/lib/grub2/x86_64-xen/grub.xen", "", "")
|
|
+ if os.path.exists("/usr/share/grub2/x86_64-xen/grub.xen"):
|
|
+ self._treemedia_bootconfig = ("/usr/share/grub2/x86_64-xen/grub.xen", "", "")
|
|
+ else:
|
|
+ self._treemedia_bootconfig = ("/usr/lib/grub2/x86_64-xen/grub.xen", "", "")
|
|
log.debug("Using grub.xen to boot guest")
|
|
on_reboot_value = guest.on_reboot
|
|
self._alter_bootconfig(guest)
|
|
Index: virt-manager-3.2.0/virtManager/delete.py
|
|
===================================================================
|
|
--- virt-manager-3.2.0.orig/virtManager/delete.py
|
|
+++ virt-manager-3.2.0/virtManager/delete.py
|
|
@@ -458,7 +458,7 @@ def _populate_storage_list(storage_list,
|
|
model.clear()
|
|
|
|
for diskdata in diskdatas:
|
|
- if not diskdata.path or diskdata.path == "/usr/lib/grub2/x86_64-xen/grub.xen":
|
|
+ if not diskdata.path or "grub.xen" in diskdata.path:
|
|
continue
|
|
|
|
# There are a few pieces here
|