virt-manager/virtinst-change-location-for-grub_xen.patch

32 lines
1.4 KiB
Diff
Raw Normal View History

References: fate#326960, bsc#1123942
Index: virt-manager-2.1.0/virtinst/installer.py
===================================================================
--- virt-manager-2.1.0.orig/virtinst/installer.py
+++ virt-manager-2.1.0/virtinst/installer.py
@@ -312,7 +312,10 @@ class Installer(object):
guest.os.bootloader = "pygrub"
else:
guest.os.bootloader = None
- self._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
+ if os.path.exists("/usr/share/grub2/x86_64-xen/grub.xen"):
+ self._install_kernel = "/usr/share/grub2/x86_64-xen/grub.xen"
+ else:
+ self._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
self._install_initrd = None
self.extraargs = None
logging.info("Using grub.xen to boot guest")
Index: virt-manager-2.1.0/virtManager/delete.py
===================================================================
--- virt-manager-2.1.0.orig/virtManager/delete.py
+++ virt-manager-2.1.0/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