- bnc#900320 - virt-install properly finds the lxc emulator when
xen-tools is installed OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=214
This commit is contained in:
parent
d3bd34b891
commit
3960139963
@ -103,6 +103,12 @@ Mon Oct 20 06:40:47 UTC 2014 - dimstar@opensuse.org
|
|||||||
Vte, though, we are certain that we DO require the Gtk 3.0
|
Vte, though, we are certain that we DO require the Gtk 3.0
|
||||||
variant (boo#901869).
|
variant (boo#901869).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 10 15:33:32 UTC 2014 - cbosdonnat@suse.com
|
||||||
|
|
||||||
|
- bnc#900320 - virt-install properly finds the lxc emulator when
|
||||||
|
xen-tools is installed
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Oct 9 11:22:14 MDT 2014 - carnold@suse.com
|
Thu Oct 9 11:22:14 MDT 2014 - carnold@suse.com
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define with_guestfs 0
|
%define with_guestfs 0
|
||||||
%define askpass_package "openssh-askpass"
|
%define askpass_package "openssh-askpass"
|
||||||
%define qemu_user "qemu"
|
%define qemu_user "qemu"
|
||||||
|
@ -19,8 +19,8 @@ Index: virt-manager-1.1.0/virtinst/guest.py
|
|||||||
+ preferred_emulator = "/usr/bin/qemu-system-ppc64"
|
+ preferred_emulator = "/usr/bin/qemu-system-ppc64"
|
||||||
else:
|
else:
|
||||||
preferred_emulator = "/usr/bin/qemu-system-x86_64"
|
preferred_emulator = "/usr/bin/qemu-system-x86_64"
|
||||||
else:
|
elif self.conn.is_lxc():
|
||||||
@@ -879,7 +881,7 @@ class Guest(XMLBuilder):
|
@@ -883,7 +885,7 @@ class Guest(XMLBuilder):
|
||||||
if not self._lookup_osdict_key(key, False):
|
if not self._lookup_osdict_key(key, False):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@ -29,7 +29,7 @@ Index: virt-manager-1.1.0/virtinst/guest.py
|
|||||||
return True
|
return True
|
||||||
if (self.os.is_arm_vexpress() and
|
if (self.os.is_arm_vexpress() and
|
||||||
self.os.dtb and
|
self.os.dtb and
|
||||||
@@ -930,6 +932,8 @@ class Guest(XMLBuilder):
|
@@ -934,6 +936,8 @@ class Guest(XMLBuilder):
|
||||||
net_model = None
|
net_model = None
|
||||||
elif self._can_virtio("virtionet"):
|
elif self._can_virtio("virtionet"):
|
||||||
net_model = "virtio"
|
net_model = "virtio"
|
||||||
|
@ -10,7 +10,7 @@ Index: virt-manager-1.1.0/virtinst/guest.py
|
|||||||
import logging
|
import logging
|
||||||
|
|
||||||
import urlgrabber.progress as progress
|
import urlgrabber.progress as progress
|
||||||
@@ -748,14 +749,22 @@ class Guest(XMLBuilder):
|
@@ -748,14 +749,26 @@ class Guest(XMLBuilder):
|
||||||
self.emulator = None
|
self.emulator = None
|
||||||
return
|
return
|
||||||
|
|
||||||
@ -20,6 +20,10 @@ Index: virt-manager-1.1.0/virtinst/guest.py
|
|||||||
+ preferred_emulator = "/usr/bin/qemu-system-s390x"
|
+ preferred_emulator = "/usr/bin/qemu-system-s390x"
|
||||||
+ else:
|
+ else:
|
||||||
+ preferred_emulator = "/usr/bin/qemu-system-x86_64"
|
+ preferred_emulator = "/usr/bin/qemu-system-x86_64"
|
||||||
|
+ elif self.conn.is_lxc():
|
||||||
|
+ preferred_emulator = "/usr/lib/libvirt/libvirt_lxc"
|
||||||
|
+ if not os.path.exists(preferred_emulator):
|
||||||
|
+ preferred_emulator = "/usr/lib64/libvirt/libvirt_lxc"
|
||||||
+ else:
|
+ else:
|
||||||
+ preferred_emulator = "/usr/lib/xen/bin/qemu-system-i386"
|
+ preferred_emulator = "/usr/lib/xen/bin/qemu-system-i386"
|
||||||
+ if self.emulator and self.emulator == preferred_emulator:
|
+ if self.emulator and self.emulator == preferred_emulator:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user