pool/virt-manager
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bsc#1123942 - [XEN][Build157.1] failed to open file

Browse Source 
'/usr/lib/grub2/x86_64-xen/grub.xen during bootup PV guest 
  virtinst-change-location-for-grub_xen.patch
  virt-install.desktop

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=454
This commit is contained in:
Charles Arnold 2019-02-01 17:07:42 +00:00 committed by Git OBS Bridge
parent b94cda9ed8
commit 80ab7ac0fb
3 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
virt-manager.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 1 09:34:31 MST 2019 - carnold@suse.com
- bsc#1123942 - [XEN][Build157.1] failed to open file
'/usr/lib/grub2/x86_64-xen/grub.xen during bootup PV guest
virtinst-change-location-for-grub_xen.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 9 15:55:22 MST 2019 - carnold@suse.com Wed Jan 9 15:55:22 MST 2019 - carnold@suse.com
@ -16,6 +23,7 @@ Mon Dec 3 13:31:50 UTC 2018 - Stasiek Michalski <hellcp@mailbox.org>
- Change icons to those provided by package - Change icons to those provided by package
(yast2-theme doesn't provide some icons anymore) (yast2-theme doesn't provide some icons anymore)
virt-install.desktop
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 29 11:50:08 MST 2018 - carnold@suse.com Thu Nov 29 11:50:08 MST 2018 - carnold@suse.com

4
virt-manager.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
@ -43,6 +43,7 @@ Patch72: virtman-keycombo.patch
Patch73: virtman-show-suse-install-repos.patch Patch73: virtman-show-suse-install-repos.patch
Patch74: virtman-dont-allow-grub.xen-to-be-deleted.patch Patch74: virtman-dont-allow-grub.xen-to-be-deleted.patch
Patch75: virtinst-pvgrub2-bootloader.patch Patch75: virtinst-pvgrub2-bootloader.patch
Patch76: virtinst-change-location-for-grub_xen.patch
# Features or Enhancements # Features or Enhancements
Patch101: virtman-default-guest-from-host-os.patch Patch101: virtman-default-guest-from-host-os.patch
Patch102: virtman-default-to-xen-pv.patch Patch102: virtman-default-to-xen-pv.patch
@ -173,6 +174,7 @@ machine).
%patch73 -p1 %patch73 -p1
%patch74 -p1 %patch74 -p1
%patch75 -p1 %patch75 -p1
%patch76 -p1
# Enhancements # Enhancements
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1

31
virtinst-change-location-for-grub_xen.patch Normal file
View File

@ -0,0 +1,31 @@
References: fate#326960, bsc#1123942
Index: virt-manager-2.0.0/virtinst/installer.py
===================================================================
--- virt-manager-2.0.0.orig/virtinst/installer.py
+++ virt-manager-2.0.0/virtinst/installer.py
@@ -316,7 +316,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.0.0/virtManager/delete.py
===================================================================
--- virt-manager-2.0.0.orig/virtManager/delete.py
+++ virt-manager-2.0.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