Accepting request 652243 from Virtualization

Fix for bsc#1116990

OBS-URL: https://build.opensuse.org/request/show/652243
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=185
This commit is contained in:
Dominique Leuenberger 2018-11-28 10:15:35 +00:00 committed by Git OBS Bridge
commit 6c54fcca01
3 changed files with 20 additions and 6 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Nov 27 13:13:15 MST 2018 - carnold@suse.com
- bsc#1116990 - [virt-install] internal error: libxenlight failed
to create new domain 'sles-11-sp4-64-pv-def-net'. Fix reversed
logic when testing for i386.
virtinst-use-xenpae-kernel-for-32bit.patch
-------------------------------------------------------------------
Tue Oct 30 16:06:51 MDT 2018 - carnold@suse.com
@ -68,6 +76,12 @@ Tue Oct 16 02:24:29 UTC 2018 - James Fehlig <jfehlig@suse.com>
- Fix selection of network volumes (bsc#1100558)
5a7698c7-fix-select-network-vol.patch
-------------------------------------------------------------------
Mon Oct 15 06:41:55 UTC 2018 - Klaus Kämpf <kkaempf@suse.com>
- Remove hard dependency on openSUSE branding by changing it to a
recommends
-------------------------------------------------------------------
Fri Jul 13 16:03:17 MDT 2018 - carnold@suse.com

View File

@ -97,7 +97,7 @@ Requires: virt-install
Requires: virt-manager-common = %{verrel}
%if 0%{?is_opensuse} == 1
# virtman-desktop.patch changes the icon to be yast-vm-management, which is provided by yast2-branding
Requires: yast2-branding-openSUSE
Recommends: yast2-branding-openSUSE
%endif
%if %{with_guestfs}

View File

@ -15,14 +15,14 @@ Index: virt-manager-2.0.0/virtinst/urldetect.py
- self._kernel_paths.append(
- ("boot/%s/vmlinuz-xen" % tree_arch,
- "boot/%s/initrd-xen" % tree_arch))
+ if self.arch == "i386":
+ self._kernel_paths.append(
+ ("boot/%s/vmlinuz-xen" % tree_arch,
+ "boot/%s/initrd-xen" % tree_arch))
+ else:
+ if tree_arch == "i386":
+ self._kernel_paths.append(
+ ("boot/%s/vmlinuz-xenpae" % tree_arch,
+ "boot/%s/initrd-xenpae" % tree_arch))
+ else:
+ self._kernel_paths.append(
+ ("boot/%s/vmlinuz-xen" % tree_arch,
+ "boot/%s/initrd-xen" % tree_arch))
if (tree_arch == "s390x" and
(self._os_variant == "sles11" or self._os_variant == "sled11")):