8d6890f068
virt-manager-2.1.0.tar.bz2 virtman-fix-env-script-interpreter.patch * Bash autocompletion support (Lin Ma, Cole Robinson) * UI and command line –vsock support (Slavomir Kaslev) * virt-xml: Add –os-variant option (Andrea Bolognani) * virt-install: use libosinfo cpu, mem, disk size defaults (Fabiano Fidencio) * virt-install: Better usage of libosinfo -unknown distro IDs (Fabiano Fidencio) * virt-install: More usage of libosinfo for ISO –location detection * virt-install: Add –location LOCATION,kernel=X,initrd=Y for pointing to kernel/initrd in media that virt-install/libosinfo fails to detect - Drop 25b88733-urldetect-Dont-overload-suse_content-variable.patch 9308bae3-util-Fix-typo-vpcu-vcpu.patch b8aff280-virtinst-quickfix-ubuntu-net-preseed-insert-cdrom-error.patch c30b3bc6-increase-timeout-for-vm-to-start.patch virtinst-use-latest-opensuse-version-when-unknown-media.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=456
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
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
|