cc21dc861d
default virtinst-pvgrub2-bootloader.patch - Rebased patches virtinst-change-location-for-grub_xen.patch virtman-increase-setKeepAlive-count.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=490
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
References: fate#326960, bsc#1123942
|
|
|
|
Index: virt-manager-2.2.1/virtinst/install/installer.py
|
|
===================================================================
|
|
--- virt-manager-2.2.1.orig/virtinst/install/installer.py
|
|
+++ virt-manager-2.2.1/virtinst/install/installer.py
|
|
@@ -445,7 +445,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-2.2.1/virtManager/delete.py
|
|
===================================================================
|
|
--- virt-manager-2.2.1.orig/virtManager/delete.py
|
|
+++ virt-manager-2.2.1/virtManager/delete.py
|
|
@@ -246,7 +246,7 @@ def populate_storage_list(storage_list,
|
|
diskdata.append(("dtb", vm.get_xmlobj().os.dtb, True, False, True))
|
|
|
|
for target, path, ro, shared, is_media in diskdata:
|
|
- if not path or path == "/usr/lib/grub2/x86_64-xen/grub.xen":
|
|
+ if not path or "grub.xen" in path:
|
|
continue
|
|
|
|
# There are a few pieces here
|