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

- bnc#909225 - pygrub Unable to find partition containing kernel

Browse Source 
Update virtinst-pvgrub2-bootloader.patch

- Reorder virt-manager patches according to type
- Drop virtman-cdrom.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=216
This commit is contained in:
Charles Arnold 2015-01-05 18:16:33 +00:00 committed by Git OBS Bridge
parent 3960139963
commit b78bd34b50
19 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
virt-manager.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Dec 10 08:52:01 MST 2014 - carnold@suse.com
- bnc#909225 - pygrub Unable to find partition containing kernel
Update virtinst-pvgrub2-bootloader.patch
-------------------------------------------------------------------
Tue Dec 9 11:07:55 MST 2014 - carnold@suse.com
- Reorder virt-manager patches according to type
- Drop virtman-cdrom.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 2 12:11:29 MST 2014 - carnold@suse.com Tue Dec 2 12:11:29 MST 2014 - carnold@suse.com

151
virt-manager.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package virt-manager # spec file for package virt-manager
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX Products 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
@ -15,7 +15,6 @@
# 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"
@ -36,50 +35,52 @@ Url: http://virt-manager.org/
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Source1: virt-install.rb Source1: virt-install.rb
Source2: virt-install.desktop Source2: virt-install.desktop
# SUSE Only
Patch70: virtman-desktop.patch Patch70: virtman-desktop.patch
Patch71: virtman-cdrom.patch Patch71: virtman-kvm.patch
Patch72: virtman-kvm.patch Patch72: virtman-keycombo.patch
Patch73: virtman-keycombo.patch Patch73: virtman-vminstall.patch
Patch74: virtman-eepro100.patch Patch74: virtman-show-suse-install-repos.patch
Patch75: virtman-supported-disk-formats.patch Patch75: virtman-stable-os-support.patch
Patch80: virtman-default-guest-from-host-os.patch Patch76: virtman-dont-allow-grub.xen-to-be-deleted.patch
Patch81: virtman-default-to-xen-pv.patch Patch77: virtman-s390x-default-to-vminstall.patch
Patch82: virtman-autoyast-support.patch Patch78: virtman-libvirtd-not-running.patch
Patch83: virtman-vminstall.patch Patch79: virtinst-pvgrub2-bootloader.patch
Patch84: virtman-show-suse-install-repos.patch Patch80: virtinst-nfs-install-sanitize.patch
Patch85: virtman-packages.patch # Features or Enhancements
Patch86: virtman-load-stored-uris.patch Patch100: virtman-eepro100.patch
Patch87: virtman-libvirtd-not-running.patch Patch101: virtman-default-guest-from-host-os.patch
Patch88: virtman-stable-os-support.patch Patch102: virtman-default-to-xen-pv.patch
Patch89: virtman-add-s390x-arch-support.patch Patch103: virtman-autoyast-support.patch
Patch90: virtman-prevent-double-click-starting-vm-twice.patch Patch104: virtman-packages.patch
Patch91: virtman-default-lxc-uri.patch Patch105: virtman-load-stored-uris.patch
Patch92: virtman-add-connect-default.patch Patch106: virtman-add-s390x-arch-support.patch
Patch93: virtman-dont-allow-grub.xen-to-be-deleted.patch Patch107: virtman-default-lxc-uri.patch
Patch94: virtman-check-for-empty-network-name.patch Patch108: virtman-add-connect-default.patch
Patch95: virtman-s390x-default-to-vminstall.patch Patch120: virtinst-storage-ocfs2.patch
Patch96: virtman-increase-setKeepAlive-count.patch Patch121: virtinst-supported-disk-formats.patch
Patch97: virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch Patch122: virtinst-support-suse-distros.patch
Patch98: virtman-sync-vm-startup-for-cpu-usage.patch Patch123: virtinst-detect-suse-distros.patch
Patch99: virtman-check-for-valid-display.patch Patch124: virtinst-modify-gui-defaults.patch
Patch151: virtinst-storage-ocfs2.patch Patch125: virtinst-vol-default-nocow.patch
Patch152: virtinst-supported-disk-formats.patch Patch126: virtinst-detect-windows-media.patch
Patch153: virtinst-support-suse-distros.patch Patch127: virtinst-set-cache-mode-unsafe-for-install.patch
Patch154: virtinst-detect-suse-distros.patch Patch128: virtinst-add-default-rng-device.patch
Patch155: virtinst-xen-drive-type.patch Patch129: virtinst-set-qemu-emulator.patch
Patch156: virtinst-modify-gui-defaults.patch Patch130: virtinst-ppc64le.patch
Patch157: virtinst-pvgrub2-bootloader.patch # Bug Fixes
Patch158: virtinst-set-qemu-emulator.patch Patch150: virtman-supported-disk-formats.patch
Patch159: virtinst-vol-default-nocow.patch Patch151: virtman-prevent-double-click-starting-vm-twice.patch
Patch160: virtinst-detect-windows-media.patch Patch152: virtman-check-for-empty-network-name.patch
Patch161: virtinst-xenbus-disk-index-fix.patch Patch153: virtman-increase-setKeepAlive-count.patch
Patch162: virtinst-set-cache-mode-unsafe-for-install.patch Patch154: virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch
Patch163: virtinst-add-default-rng-device.patch Patch155: virtman-sync-vm-startup-for-cpu-usage.patch
Patch164: virtinst-refresh_before_fetch_pool.patch Patch156: virtman-check-for-valid-display.patch
Patch165: virtinst-nfs-install-sanitize.patch Patch157: virtinst-xen-drive-type.patch
Patch166: virtinst-ppc64le.patch Patch158: virtinst-xenbus-disk-index-fix.patch
Patch167: virtinst-ignore-error-403-on-directories.patch Patch159: virtinst-refresh_before_fetch_pool.patch
Patch168: virt-manager-Gtk-30.patch Patch160: virtinst-ignore-error-403-on-directories.patch
Patch161: virt-manager-Gtk-30.patch
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -158,32 +159,41 @@ machine).
%prep %prep
%setup -q %setup -q
# SUSE Only
%patch70 -p1 %patch70 -p1
%patch71 -p1 %patch71 -p1
%patch72 -p1 %patch72 -p1
%patch73 -p1 %patch73 -p1
%patch74 -p1 %patch74 -p1
%patch75 -p1 %patch75 -p1
%patch76 -p1
%patch77 -p1
%patch78 -p1
%patch79 -p1
%patch80 -p1 %patch80 -p1
%patch81 -p1 # Enhancements
%patch82 -p1 %patch100 -p1
%patch83 -p1 %patch101 -p1
%patch84 -p1 %patch102 -p1
%patch85 -p1 %patch103 -p1
%patch86 -p1 %patch104 -p1
%patch87 -p1 %patch105 -p1
%patch88 -p1 %patch106 -p1
%patch89 -p1 %patch107 -p1
%patch90 -p1 %patch108 -p1
%patch91 -p1 %patch120 -p1
%patch92 -p1 %patch121 -p1
%patch93 -p1 %patch122 -p1
%patch94 -p1 %patch123 -p1
%patch95 -p1 %patch124 -p1
%patch96 -p1 %patch125 -p1
%patch97 -p1 %patch126 -p1
%patch98 -p1 %patch127 -p1
%patch99 -p1 %patch128 -p1
%patch129 -p1
%patch130 -p1
# Bug Fixes
%patch150 -p1
%patch151 -p1 %patch151 -p1
%patch152 -p1 %patch152 -p1
%patch153 -p1 %patch153 -p1
@ -195,13 +205,6 @@ machine).
%patch159 -p1 %patch159 -p1
%patch160 -p1 %patch160 -p1
%patch161 -p1 %patch161 -p1
%patch162 -p1
%patch163 -p1
%patch164 -p1
%patch165 -p1
%patch166 -p1
%patch167 -p1
%patch168 -p1
%build %build
%if %{qemu_user} %if %{qemu_user}
@ -308,10 +311,8 @@ fi
%{_datadir}/%{name}/virt-clone %{_datadir}/%{name}/virt-clone
%{_datadir}/%{name}/virt-convert %{_datadir}/%{name}/virt-convert
%{_datadir}/%{name}/virt-xml %{_datadir}/%{name}/virt-xml
%dir %{_datadir}/YaST2 %dir %{_datadir}/*
%dir %{_datadir}/YaST2/clients %dir %{_datadir}/*/*
%dir %{_datadir}/applications/YaST2
%dir %{_datadir}/appdata
%{_datadir}/YaST2/clients/virt-install.rb %{_datadir}/YaST2/clients/virt-install.rb
%{_datadir}/applications/YaST2/virt-install.desktop %{_datadir}/applications/YaST2/virt-install.desktop

4
virtinst-add-default-rng-device.patch
View File

@ -4,7 +4,7 @@ Index: virt-manager-1.1.0/virtinst/guest.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtinst/guest.py --- virt-manager-1.1.0.orig/virtinst/guest.py
+++ virt-manager-1.1.0/virtinst/guest.py +++ virt-manager-1.1.0/virtinst/guest.py
@@ -639,6 +639,15 @@ class Guest(XMLBuilder): @@ -638,6 +638,15 @@ class Guest(XMLBuilder):
return return
self.add_device(virtinst.VirtualGraphics(self.conn)) self.add_device(virtinst.VirtualGraphics(self.conn))
@ -20,7 +20,7 @@ Index: virt-manager-1.1.0/virtinst/guest.py
def add_default_devices(self): def add_default_devices(self):
self.add_default_graphics() self.add_default_graphics()
self.add_default_video_device() self.add_default_video_device()
@@ -646,6 +655,7 @@ class Guest(XMLBuilder): @@ -645,6 +654,7 @@ class Guest(XMLBuilder):
self.add_default_console_device() self.add_default_console_device()
self.add_default_usb_controller() self.add_default_usb_controller()
self.add_default_channels() self.add_default_channels()

8
virtinst-detect-suse-distros.patch
View File

@ -2,7 +2,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtinst/urlfetcher.py --- virt-manager-1.1.0.orig/virtinst/urlfetcher.py
+++ virt-manager-1.1.0/virtinst/urlfetcher.py +++ virt-manager-1.1.0/virtinst/urlfetcher.py
@@ -321,6 +321,89 @@ def _distroFromTreeinfo(fetcher, arch, v @@ -323,6 +323,89 @@ def _distroFromTreeinfo(fetcher, arch, v
return ob return ob
@ -92,7 +92,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py
def getDistroStore(guest, fetcher): def getDistroStore(guest, fetcher):
stores = [] stores = []
@@ -337,6 +420,10 @@ def getDistroStore(guest, fetcher): @@ -339,6 +422,10 @@ def getDistroStore(guest, fetcher):
if dist: if dist:
return dist return dist
@ -103,7 +103,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py
stores = _allstores[:] stores = _allstores[:]
# If user manually specified an os_distro, bump it's URL class # If user manually specified an os_distro, bump it's URL class
@@ -819,29 +906,59 @@ class SLDistro(RHELDistro): @@ -821,29 +908,59 @@ class SLDistro(RHELDistro):
class SuseDistro(Distro): class SuseDistro(Distro):
name = "SUSE" name = "SUSE"
@ -172,7 +172,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py
return True return True
def _get_method_arg(self): def _get_method_arg(self):
@@ -861,6 +978,27 @@ class SuseDistro(Distro): @@ -863,6 +980,27 @@ class SuseDistro(Distro):
return osobj.name return osobj.name
return self.os_variant return self.os_variant

6
virtinst-detect-windows-media.patch
View File

@ -2,7 +2,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtinst/urlfetcher.py --- virt-manager-1.1.0.orig/virtinst/urlfetcher.py
+++ virt-manager-1.1.0/virtinst/urlfetcher.py +++ virt-manager-1.1.0/virtinst/urlfetcher.py
@@ -405,6 +405,24 @@ def _distroFromContent(fetcher, arch, vm @@ -407,6 +407,24 @@ def _distroFromContent(fetcher, arch, vm
return ob return ob
@ -27,7 +27,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py
def getDistroStore(guest, fetcher): def getDistroStore(guest, fetcher):
stores = [] stores = []
logging.debug("Finding distro store for location=%s", fetcher.location) logging.debug("Finding distro store for location=%s", fetcher.location)
@@ -424,6 +442,10 @@ def getDistroStore(guest, fetcher): @@ -426,6 +444,10 @@ def getDistroStore(guest, fetcher):
if dist: if dist:
return dist return dist
@ -38,7 +38,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py
stores = _allstores[:] stores = _allstores[:]
# If user manually specified an os_distro, bump it's URL class # If user manually specified an os_distro, bump it's URL class
@@ -1159,6 +1181,13 @@ class ALTLinuxDistro(Distro): @@ -1161,6 +1183,13 @@ class ALTLinuxDistro(Distro):
logging.debug("Regex didn't match, not a %s distro", self.name) logging.debug("Regex didn't match, not a %s distro", self.name)
return False return False

4
virtinst-pvgrub2-bootloader.patch
View File

@ -2,14 +2,14 @@ Index: virt-manager-1.1.0/virtinst/guest.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtinst/guest.py --- virt-manager-1.1.0.orig/virtinst/guest.py
+++ virt-manager-1.1.0/virtinst/guest.py +++ virt-manager-1.1.0/virtinst/guest.py
@@ -353,8 +353,18 @@ class Guest(XMLBuilder): @@ -350,8 +350,18 @@ 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": + if os_ver == "sles12" or os_ver == "sled12" or os_ver == "opensuse13":
+ 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

6
virtinst-set-cache-mode-unsafe-for-install.patch
View File

@ -2,7 +2,7 @@ Index: virt-manager-1.1.0/virtinst/guest.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtinst/guest.py --- virt-manager-1.1.0.orig/virtinst/guest.py
+++ virt-manager-1.1.0/virtinst/guest.py +++ virt-manager-1.1.0/virtinst/guest.py
@@ -32,6 +32,7 @@ from virtinst import util @@ -31,6 +31,7 @@ from virtinst import util
from virtinst import support from virtinst import support
from virtinst import OSXML from virtinst import OSXML
from virtinst import VirtualDevice from virtinst import VirtualDevice
@ -10,7 +10,7 @@ Index: virt-manager-1.1.0/virtinst/guest.py
from virtinst import Clock from virtinst import Clock
from virtinst import Seclabel from virtinst import Seclabel
from virtinst import CPU from virtinst import CPU
@@ -349,6 +350,13 @@ class Guest(XMLBuilder): @@ -348,6 +349,13 @@ class Guest(XMLBuilder):
self.on_crash = action self.on_crash = action
self._set_defaults() self._set_defaults()
@ -24,7 +24,7 @@ Index: virt-manager-1.1.0/virtinst/guest.py
self.bootloader = None self.bootloader = None
if (not install and if (not install and
@@ -367,7 +375,10 @@ class Guest(XMLBuilder): @@ -366,7 +374,10 @@ class Guest(XMLBuilder):
self.bootloader = "/usr/bin/pygrub" self.bootloader = "/usr/bin/pygrub"
self.os.clear() self.os.clear()

2
virtinst-set-qemu-emulator.patch
View File

@ -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,26 @@ class Guest(XMLBuilder): @@ -769,14 +770,26 @@ class Guest(XMLBuilder):
self.emulator = None self.emulator = None
return return

4
virtman-add-connect-default.patch
View File

@ -2,7 +2,7 @@ Index: virt-manager-1.1.0/virtManager/engine.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtManager/engine.py --- virt-manager-1.1.0.orig/virtManager/engine.py
+++ virt-manager-1.1.0/virtManager/engine.py +++ virt-manager-1.1.0/virtManager/engine.py
@@ -202,9 +202,6 @@ class vmmEngine(vmmGObject): @@ -203,9 +203,6 @@ class vmmEngine(vmmGObject):
except: except:
logging.exception("Error talking to PackageKit") logging.exception("Error talking to PackageKit")
@ -12,7 +12,7 @@ Index: virt-manager-1.1.0/virtManager/engine.py
warnmsg = _("The 'libvirtd' service will need to be started.\n\n" warnmsg = _("The 'libvirtd' service will need to be started.\n\n"
"After that, virt-manager will connect to libvirt on\n" "After that, virt-manager will connect to libvirt on\n"
"the next application start up.") "the next application start up.")
@@ -218,7 +215,11 @@ class vmmEngine(vmmGObject): @@ -219,7 +216,11 @@ class vmmEngine(vmmGObject):
if not connected and do_start: if not connected and do_start:
manager.err.ok(_("Libvirt service must be started"), warnmsg) manager.err.ok(_("Libvirt service must be started"), warnmsg)

6
virtman-add-s390x-arch-support.patch
View File

@ -49,7 +49,7 @@ Index: virt-manager-1.1.0/virtinst/guest.py
self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY
self._os_variant = None self._os_variant = None
@@ -559,11 +562,13 @@ class Guest(XMLBuilder): @@ -569,11 +572,13 @@ class Guest(XMLBuilder):
self.conn.check_support( self.conn.check_support(
self.conn.SUPPORT_CONN_VIRTIO_CONSOLE)): self.conn.SUPPORT_CONN_VIRTIO_CONSOLE)):
dev.target_type = "virtio" dev.target_type = "virtio"
@ -64,7 +64,7 @@ Index: virt-manager-1.1.0/virtinst/guest.py
return return
if self.get_devices("video"): if self.get_devices("video"):
return return
@@ -608,7 +613,7 @@ class Guest(XMLBuilder): @@ -618,7 +623,7 @@ class Guest(XMLBuilder):
return return
if self.os.is_container(): if self.os.is_container():
return return
@ -73,7 +73,7 @@ Index: virt-manager-1.1.0/virtinst/guest.py
return return
self.add_device(virtinst.VirtualGraphics(self.conn)) self.add_device(virtinst.VirtualGraphics(self.conn))
@@ -834,7 +839,7 @@ class Guest(XMLBuilder): @@ -844,7 +849,7 @@ class Guest(XMLBuilder):
if not self._lookup_osdict_key(key, False): if not self._lookup_osdict_key(key, False):
return False return False

6
virtman-autoyast-support.patch
View File

@ -2,7 +2,7 @@ Index: virt-manager-1.1.0/virtManager/create.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtManager/create.py --- virt-manager-1.1.0.orig/virtManager/create.py
+++ virt-manager-1.1.0/virtManager/create.py +++ virt-manager-1.1.0/virtManager/create.py
@@ -1257,11 +1257,34 @@ class vmmCreate(vmmGObjectUI): @@ -1265,11 +1265,34 @@ class vmmCreate(vmmGObjectUI):
if self.widget("install-os-version").get_visible(): if self.widget("install-os-version").get_visible():
self.widget("install-os-version-entry").grab_focus() self.widget("install-os-version-entry").grab_focus()
@ -37,7 +37,7 @@ Index: virt-manager-1.1.0/virtManager/create.py
# Get previous # Get previous
type_row = self._selected_os_row() type_row = self._selected_os_row()
if not type_row: if not type_row:
@@ -1626,7 +1649,10 @@ class vmmCreate(vmmGObjectUI): @@ -1634,7 +1657,10 @@ class vmmCreate(vmmGObjectUI):
if extra: if extra:
extraargs += extra extraargs += extra
if ks: if ks:
@ -49,7 +49,7 @@ Index: virt-manager-1.1.0/virtManager/create.py
if extraargs: if extraargs:
self.guest.installer.extraargs = extraargs self.guest.installer.extraargs = extraargs
@@ -2034,6 +2060,7 @@ class vmmCreate(vmmGObjectUI): @@ -2042,6 +2068,7 @@ class vmmCreate(vmmGObjectUI):
dl = self.set_os_val(self.widget("install-os-type"), distro_type) dl = self.set_os_val(self.widget("install-os-type"), distro_type)
vl = self.set_os_val(self.widget("install-os-version"), distro_var) vl = self.set_os_val(self.widget("install-os-version"), distro_var)
self.set_distro_labels(dl, vl) self.set_distro_labels(dl, vl)

13
virtman-cdrom.patch
View File

@ -1,13 +0,0 @@
Index: virt-manager-1.1.0/virtManager/addhardware.py
===================================================================
--- virt-manager-1.1.0.orig/virtManager/addhardware.py
+++ virt-manager-1.1.0/virtManager/addhardware.py
@@ -800,7 +800,7 @@ class vmmAddHardware(vmmGObjectUI):
disk_buses = ["ide", "sata", "scsi", "sd",
"usb", "virtio", "virtio-scsi", "xen"]
floppy_buses = ["fdc"]
- cdrom_buses = ["ide", "scsi"]
+ cdrom_buses = ["ide", "scsi", "xen"]
lun_buses = ["virtio-scsi"]
if bus in disk_buses:

6
virtman-default-guest-from-host-os.patch
View File

@ -2,7 +2,7 @@ Index: virt-manager-1.1.0/virtManager/create.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtManager/create.py --- virt-manager-1.1.0.orig/virtManager/create.py
+++ virt-manager-1.1.0/virtManager/create.py +++ virt-manager-1.1.0/virtManager/create.py
@@ -21,6 +21,8 @@ @@ -22,6 +22,8 @@ import traceback
import logging import logging
import threading import threading
import time import time
@ -11,7 +11,7 @@ Index: virt-manager-1.1.0/virtManager/create.py
from gi.repository import GObject from gi.repository import GObject
from gi.repository import Gtk from gi.repository import Gtk
@@ -1167,6 +1169,55 @@ class vmmCreate(vmmGObjectUI): @@ -1175,6 +1177,55 @@ class vmmCreate(vmmGObjectUI):
return return
self.start_detection(forward=forward) self.start_detection(forward=forward)
@ -67,7 +67,7 @@ Index: virt-manager-1.1.0/virtManager/create.py
def toggle_detect_os(self, src): def toggle_detect_os(self, src):
dodetect = src.get_active() dodetect = src.get_active()
@@ -1179,6 +1230,8 @@ class vmmCreate(vmmGObjectUI): @@ -1187,6 +1238,8 @@ class vmmCreate(vmmGObjectUI):
self.widget("install-os-version-entry").set_text("") self.widget("install-os-version-entry").set_text("")
self.mediaDetected = False self.mediaDetected = False
self.detect_media_os() self.detect_media_os()

2
virtman-default-to-xen-pv.patch
View File

@ -2,7 +2,7 @@ Index: virt-manager-1.1.0/virtManager/create.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtManager/create.py --- virt-manager-1.1.0.orig/virtManager/create.py
+++ virt-manager-1.1.0/virtManager/create.py +++ virt-manager-1.1.0/virtManager/create.py
@@ -876,7 +876,12 @@ class vmmCreate(vmmGObjectUI): @@ -884,7 +884,12 @@ class vmmCreate(vmmGObjectUI):
if gtype is None: if gtype is None:
# If none specified, prefer HVM so install options aren't limited # If none specified, prefer HVM so install options aren't limited
# with a default PV choice. # with a default PV choice.

2
virtman-load-stored-uris.patch
View File

@ -2,7 +2,7 @@ Index: virt-manager-1.1.0/virtManager/engine.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtManager/engine.py --- virt-manager-1.1.0.orig/virtManager/engine.py
+++ virt-manager-1.1.0/virtManager/engine.py +++ virt-manager-1.1.0/virtManager/engine.py
@@ -226,9 +226,22 @@ class vmmEngine(vmmGObject): @@ -227,9 +227,22 @@ class vmmEngine(vmmGObject):
if not uris: if not uris:
return return
logging.debug("About to connect to uris %s", uris) logging.debug("About to connect to uris %s", uris)

2
virtman-packages.patch
View File

@ -70,7 +70,7 @@ Index: virt-manager-1.1.0/virtManager/engine.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtManager/engine.py --- virt-manager-1.1.0.orig/virtManager/engine.py
+++ virt-manager-1.1.0/virtManager/engine.py +++ virt-manager-1.1.0/virtManager/engine.py
@@ -193,21 +193,17 @@ class vmmEngine(vmmGObject): @@ -194,21 +194,17 @@ class vmmEngine(vmmGObject):
ret = None ret = None
try: try:

6
virtman-s390x-default-to-vminstall.patch
View File

@ -10,7 +10,7 @@ Index: virt-manager-1.1.0/virtManager/engine.py
import os import os
from subprocess import * from subprocess import *
@@ -805,7 +806,7 @@ class vmmEngine(vmmGObject): @@ -795,7 +796,7 @@ class vmmEngine(vmmGObject):
obj.connect("action-clone-domain", self._do_show_clone) obj.connect("action-clone-domain", self._do_show_clone)
obj.connect("action-show-domain", self._do_show_vm) obj.connect("action-show-domain", self._do_show_vm)
obj.connect("action-show-preferences", self._do_show_preferences) obj.connect("action-show-preferences", self._do_show_preferences)
@ -19,7 +19,7 @@ Index: virt-manager-1.1.0/virtManager/engine.py
obj.connect("action-show-create-vminstall", self._do_show_create_vminstall) obj.connect("action-show-create-vminstall", self._do_show_create_vminstall)
obj.connect("action-show-about", self._do_show_about) obj.connect("action-show-about", self._do_show_about)
obj.connect("action-show-host", self._do_show_host) obj.connect("action-show-host", self._do_show_host)
@@ -853,7 +854,20 @@ class vmmEngine(vmmGObject): @@ -843,7 +844,20 @@ class vmmEngine(vmmGObject):
self.windowCreate = None self.windowCreate = None
def _do_show_create_vminstall(self, src, uri): def _do_show_create_vminstall(self, src, uri):
@ -41,7 +41,7 @@ Index: virt-manager-1.1.0/virtManager/engine.py
def _do_show_create(self, src, uri, use_vminstall=False): def _do_show_create(self, src, uri, use_vminstall=False):
if uri is None: if uri is None:
@@ -937,7 +951,10 @@ class vmmEngine(vmmGObject): @@ -927,7 +941,10 @@ class vmmEngine(vmmGObject):
def show_domain_creator(self, uri): def show_domain_creator(self, uri):
self.show_manager() self.show_manager()

2
virtman-show-suse-install-repos.patch
View File

@ -10,7 +10,7 @@ Index: virt-manager-1.1.0/virtManager/create.py
import logging import logging
import threading import threading
import time import time
@@ -370,7 +371,13 @@ class vmmCreate(vmmGObjectUI): @@ -368,7 +369,13 @@ class vmmCreate(vmmGObjectUI):
self.widget("install-url-options").set_expanded(False) self.widget("install-url-options").set_expanded(False)
urlmodel = self.widget("install-url-box").get_model() urlmodel = self.widget("install-url-box").get_model()
ksmodel = self.widget("install-ks-box").get_model() ksmodel = self.widget("install-ks-box").get_model()

2
virtman-stable-os-support.patch
View File

@ -2,7 +2,7 @@ Index: virt-manager-1.1.0/virtManager/create.py
=================================================================== ===================================================================
--- virt-manager-1.1.0.orig/virtManager/create.py --- virt-manager-1.1.0.orig/virtManager/create.py
+++ virt-manager-1.1.0/virtManager/create.py +++ virt-manager-1.1.0/virtManager/create.py
@@ -64,8 +64,9 @@ INSTALL_PAGE_CONTAINER_APP = 4 @@ -62,8 +62,9 @@ INSTALL_PAGE_CONTAINER_APP = 4
INSTALL_PAGE_CONTAINER_OS = 5 INSTALL_PAGE_CONTAINER_OS = 5
STABLE_OS_SUPPORT = [ STABLE_OS_SUPPORT = [