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

- Detect opensuse42 and use grub.xen

Browse Source 
virtinst-pvgrub2-bootloader.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=268
This commit is contained in:
Charles Arnold 2015-09-17 17:30:18 +00:00 committed by Git OBS Bridge
parent 302fdef16f
commit 36ea9a1639
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virt-manager.changes
View File

@ -4,6 +4,8 @@ Wed Sep 16 10:01:56 MDT 2015 - carnold@suse.com
- bsc#945832 - virt-manager is missing a dependency on - bsc#945832 - virt-manager is missing a dependency on
typelib-1_0-LibvirtGLib-1_0 typelib-1_0-LibvirtGLib-1_0
virt-manager.spec virt-manager.spec
- Detect opensuse42 and use grub.xen
virtinst-pvgrub2-bootloader.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 15 02:21:36 UTC 2015 - cyliu@suse.com Tue Sep 15 02:21:36 UTC 2015 - cyliu@suse.com

2
virt-manager.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package virt-manager # spec file for package virt-manager
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed

5
virtinst-pvgrub2-bootloader.patch
View File

@ -6,14 +6,15 @@ Index: virt-manager-1.2.1/virtinst/guest.py
=================================================================== ===================================================================
--- virt-manager-1.2.1.orig/virtinst/guest.py --- virt-manager-1.2.1.orig/virtinst/guest.py
+++ virt-manager-1.2.1/virtinst/guest.py +++ virt-manager-1.2.1/virtinst/guest.py
@@ -358,8 +358,18 @@ class Guest(XMLBuilder): @@ -358,8 +358,19 @@ class Guest(XMLBuilder):
if (not install and if (not install and
self.os.is_xenpv() and self.os.is_xenpv() and
not self.os.kernel): not self.os.kernel):
- self.bootloader = "/usr/bin/pygrub" - self.bootloader = "/usr/bin/pygrub"
- self.os.clear() - self.os.clear()
+ os_ver = self._get_os_variant() + os_ver = self._get_os_variant()
+ if os_ver == "sles12" or os_ver == "sled12" or os_ver == "opensuse13": + if os_ver == "sles12" or os_ver == "sled12" or \
+ os_ver == "opensuse13" or os_ver == "opensuse42":
+ self.installer._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen" + self.installer._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
+ self.installer._install_initrd = None + self.installer._install_initrd = None
+ self.installer.extraargs = None + self.installer.extraargs = None