From 36ea9a1639ee1f296ad6ddb35c77af405d82dadb Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 17 Sep 2015 17:30:18 +0000 Subject: [PATCH] - Detect opensuse42 and use grub.xen virtinst-pvgrub2-bootloader.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=268 --- virt-manager.changes | 2 ++ virt-manager.spec | 2 +- virtinst-pvgrub2-bootloader.patch | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/virt-manager.changes b/virt-manager.changes index 79800cd4..657df6ef 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -4,6 +4,8 @@ Wed Sep 16 10:01:56 MDT 2015 - carnold@suse.com - bsc#945832 - virt-manager is missing a dependency on typelib-1_0-LibvirtGLib-1_0 virt-manager.spec +- Detect opensuse42 and use grub.xen + virtinst-pvgrub2-bootloader.patch ------------------------------------------------------------------- Tue Sep 15 02:21:36 UTC 2015 - cyliu@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 870d934a..fb86fcf7 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed diff --git a/virtinst-pvgrub2-bootloader.patch b/virtinst-pvgrub2-bootloader.patch index e9af599c..74cb5beb 100644 --- a/virtinst-pvgrub2-bootloader.patch +++ b/virtinst-pvgrub2-bootloader.patch @@ -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/virtinst/guest.py -@@ -358,8 +358,18 @@ class Guest(XMLBuilder): +@@ -358,8 +358,19 @@ class Guest(XMLBuilder): if (not install and self.os.is_xenpv() and not self.os.kernel): - self.bootloader = "/usr/bin/pygrub" - self.os.clear() + 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_initrd = None + self.installer.extraargs = None