Hello community,
here is the log from the commit of package virt-manager for openSUSE:Factory
checked in at 2014-03-30 07:58:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-manager (Old)
and /work/SRC/openSUSE:Factory/.virt-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes
2014-03-14 15:18:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes
2014-03-30 12:29:47.000000000 +0200
@@ -1,0 +2,112 @@
+Fri Mar 28 11:42:38 MDT 2014 - carn...@suse.com
+
+- Reverse the last commit on requires for grub2-x86_64-xen. This
+ dependency will live in the xen-tools RPM because it is a xen
+ specific requirement.
+ virt-manager.spec
+
+-------------------------------------------------------------------
+Fri Mar 28 08:00:48 MDT 2014 - carn...@suse.com
+
+- Requires for grub2-x86_64-xen is only valid for x86_64
+ virt-manager.spec
+
+-------------------------------------------------------------------
+Wed Mar 27 18:54:21 MDT 2014 - carn...@suse.com
+
+- Virt-install is using the old legacy qemu as an emulator
+ virtinst-set-qemu-emulator.patch
+
+-------------------------------------------------------------------
+Wed Mar 27 08:28:21 MDT 2014 - carn...@suse.com
+
+- Upstream bug fixes
+ 5332ee4d-enable-media-detection-for-ISO-images.patch
+ 53341e7e-hide-hardware-removal-for-non-devices.patch
+ 53342f31-set-right-ip-address-for-ipv6.patch
+
+-------------------------------------------------------------------
+Wed Mar 26 16:36:28 MDT 2014 - carn...@suse.com
+
+- bnc#870098 - virt-manager+x show wrong number of assigned cpu's
+ virtman-init-vm-processor-topology.patch
+
+-------------------------------------------------------------------
+Wed Mar 24 13:58:36 MDT 2014 - carn...@suse.com
+
+- Make Requires of grub2-x86_64-xen conditional
+
+-------------------------------------------------------------------
+Sat Mar 22 17:00:52 MDT 2014 - carn...@suse.com
+
+- Update to virt-manager version 1.0.1
+ virt-manager-1.0.1.tar.bz2
+ * virt-install/virt-xml: New --memorybacking option (Chen Hanxiao)
+ * virt-install/virt-xml: New --memtune option (Chen Hanxiao)
+ * virt-manager: UI for LXC <idmap> (Chen Hanxiao)
+ * virt-manager: gsettings key to disable keygrab (Kjö Hansi Glaz)
+ * virt-manager: Show domain state reason in the UI (Giuseppe Scrivano)
+ * Fix a number of bugs found since the 1.0.0 release
+- Dropped 35 timestamp named patches now contained in new tarball
+
+-------------------------------------------------------------------
+Fri Mar 21 13:18:52 MDT 2014 - carn...@suse.com
+
+- bnc#869165 - virt-manager: add connection - missing avahi
+ virt-manager.spec
+- bnc#863821 - Xen unable to boot paravirtualized VMs installed
+ with btrfs
+ virtinst-pvgrub2-bootloader.patch
+- Switch out redhat defaults for suse defaults
+ virtman-stable-os-support.patch
+
+-------------------------------------------------------------------
+Wed Mar 19 13:12:57 MDT 2014 - carn...@suse.com
+
+- bnc#868194 - virt-manager gets stuck with some netinst urls
+ 532a3213-pass-correct-connection-to-install.patch
+ 532a3213-fix-url-autodetect-timeout.patch
+ 532a3213-exit-URL-detection-immediately-if-detection-fails.patch
+- bnc#869208 - virt-manager create new virtual machine fail
+ virtman-show-suse-install-repos.patch
+- bnc#869181 - virt-manager: vm wizard -Error launching manager:
+ 'NoneType' object has no attribute 'startswith'
+ virtinst-modify-gui-defaults.patch
+
+-------------------------------------------------------------------
+Tue Mar 18 14:15:06 MDT 2014 - carn...@suse.com
+
+- bnc#868676 - Error changing VM configuration: unsupported
+ configuration: unknown driver format value 'block'
+ virtinst-xen-drive-type.patch
+
+-------------------------------------------------------------------
+Tue Mar 18 11:38:42 MDT 2014 - carn...@suse.com
+
+- bnc#868200 - Unable to complete install: "NoneType' object has no
+ attribute '__getitem__"
+ virtinst-detect-suse-distros.patch
+
+-------------------------------------------------------------------
+Fri Mar 14 11:33:09 MDT 2014 - carn...@suse.com
+
+- For Xen always have the arch expander expanded.
+- For Xen and KVM default to Network install if host was installed
+ from the network
+- Default to a bridge with an actual inet address if available
+ virtinst-modify-gui-defaults.patch
+- We are not supporting PV ISO installs with virt-install.
+ Drop the following patches
+ virtinst-allow-pv-iso-install.patch
+ virtman-allow-pv-iso-install.patc
+
+-------------------------------------------------------------------
+Fri Mar 14 11:33:09 MDT 2014 - carn...@suse.com
+
+- Upstream bug fixes
+ 5321d3cd-virtinst-drop-cpu_map-parsing-of-arch-features.patch
+ 5321d3d0-virtinst-drop-parsing-of-cpu-features.patch
+ 5321f256-virtinst-use-libvirt-getCPUModelNames.patch
+ 532255b4-unselect_all-members-before-clear-model.patch
+
+-------------------------------------------------------------------
Old:
----
53022930-lxc-connection-fix.patch
530229cb-non-x86-kvm-creation-fix.patch
53023f56-dont-alter-caps-machine-list-on-create.patch
53030858-generate_target-fix.patch
53037798-not-customizing-generate_target-fix.patch
53047532-dont-get-duplicated-disks.patch
53047595-calculate-disk-bus-properly.patch
530987c4-disk-bus-calculation-fix.patch
530c021c-attempt-empty-path-on-virDomainBlockStats.patch
530cd6ab-log-broken-xml.patch
530cf4de-allow-numbered-object-names.patch
530cfa5e-close-connection-on-tick-failure-fix.patch
530f80f5-handle-missing-storage-volumes.patch
5310bd89-console-fix-unsetting-resize-guest.patch
5310e3ac-set-show_arrow-to-true.patch
5310e3ac-vmmConsolePages-toggle-visibilities-on-page-change.patch
5310e3ac-vmmDetails-toggle-visibilities-on-page-change.patch
5310e52d-fix-setting-default-window-size.patch
5318a2cd-cpu-model-fallback-failure-fix.patch
5318a626-adding-filesystem-device-fix.patch
5318aa88-invalid-libvirt-volume-XML.patch
5318b486-virtinstall-location-iso-fix.patch
5319db07-customize-add-disk-fix.patch
531db6a7-new-volume-tooltip-logic.patch
531dbfa7-handle-errors-when-deregistering-events-on-close.patch
531dd0ca-lxc-define-private-network.patch
53207f40-invalidate-cached-caps.patch
5320c976-fix-adding-empty-cdrom-floppy-drive.patch
virt-manager-1.0.0.tar.bz2
virtinst-allow-pv-iso-install.patch
virtman-allow-pv-iso-install.patch
New:
----
5332ee4d-enable-media-detection-for-ISO-images.patch
53341e7e-hide-hardware-removal-for-non-devices.patch
53342f31-set-right-ip-address-for-ipv6.patch
virt-manager-1.0.1.tar.bz2
virtinst-modify-gui-defaults.patch
virtinst-pvgrub2-bootloader.patch
virtinst-set-qemu-emulator.patch
virtman-init-vm-processor-topology.patch
virtman-stable-os-support.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:48.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:48.000000000 +0200
@@ -23,7 +23,7 @@
%define libvirt_xen_packages "libvirt-daemon-xen"
%define preferred_distros "sles,opensuse"
%define kvm_packages "qemu-x86"
-%define _version 1.0.0
+%define _version 1.0.1
%define _release 1
Name: virt-manager
@@ -36,34 +36,9 @@
Source0: %{name}-%{version}.tar.bz2
Source1: virt-install.rb
Source2: virt-install.desktop
-Patch1: 53022930-lxc-connection-fix.patch
-Patch2: 530229cb-non-x86-kvm-creation-fix.patch
-Patch3: 53023f56-dont-alter-caps-machine-list-on-create.patch
-Patch4: 53030858-generate_target-fix.patch
-Patch5: 53037798-not-customizing-generate_target-fix.patch
-Patch6: 53047532-dont-get-duplicated-disks.patch
-Patch7: 53047595-calculate-disk-bus-properly.patch
-Patch8: 530987c4-disk-bus-calculation-fix.patch
-Patch9: 530c021c-attempt-empty-path-on-virDomainBlockStats.patch
-Patch10: 530cd6ab-log-broken-xml.patch
-Patch11: 530cf4de-allow-numbered-object-names.patch
-Patch12: 530cfa5e-close-connection-on-tick-failure-fix.patch
-Patch13: 530f80f5-handle-missing-storage-volumes.patch
-Patch14: 5310bd89-console-fix-unsetting-resize-guest.patch
-Patch15: 5310e3ac-set-show_arrow-to-true.patch
-Patch16:
5310e3ac-vmmConsolePages-toggle-visibilities-on-page-change.patch
-Patch17: 5310e3ac-vmmDetails-toggle-visibilities-on-page-change.patch
-Patch18: 5310e52d-fix-setting-default-window-size.patch
-Patch19: 5318a2cd-cpu-model-fallback-failure-fix.patch
-Patch20: 5318a626-adding-filesystem-device-fix.patch
-Patch21: 5318aa88-invalid-libvirt-volume-XML.patch
-Patch22: 5318b486-virtinstall-location-iso-fix.patch
-Patch23: 5319db07-customize-add-disk-fix.patch
-Patch24: 531db6a7-new-volume-tooltip-logic.patch
-Patch25: 531dbfa7-handle-errors-when-deregistering-events-on-close.patch
-Patch26: 531dd0ca-lxc-define-private-network.patch
-Patch27: 53207f40-invalidate-cached-caps.patch
-Patch28: 5320c976-fix-adding-empty-cdrom-floppy-drive.patch
+Patch1: 5332ee4d-enable-media-detection-for-ISO-images.patch
+Patch2: 53341e7e-hide-hardware-removal-for-non-devices.patch
+Patch3: 53342f31-set-right-ip-address-for-ipv6.patch
Patch50: virtman-desktop.patch
Patch51: virtman-cdrom.patch
Patch52: virtman-kvm.patch
@@ -77,25 +52,29 @@
Patch66: virtman-reverse-serialcon.patch
Patch67: virtman-default-guest-from-host-os.patch
Patch68: virtman-default-to-xen-pv.patch
-Patch69: virtman-allow-pv-iso-install.patch
-Patch70: virtman-autoyast-support.patch
-Patch71: virtman-vminstall.patch
-Patch72: virtman-show-suse-install-repos.patch
-Patch73: virtman-packages.patch
-Patch74: virtman-load-stored-uris.patch
-Patch75: virtman-libvirtd-not-running.patch
+Patch69: virtman-autoyast-support.patch
+Patch70: virtman-vminstall.patch
+Patch71: virtman-show-suse-install-repos.patch
+Patch72: virtman-packages.patch
+Patch73: virtman-load-stored-uris.patch
+Patch74: virtman-libvirtd-not-running.patch
+Patch75: virtman-stable-os-support.patch
+Patch76: virtman-init-vm-processor-topology.patch
Patch150: virtinst-cdrom.patch
Patch151: virtinst-storage-ocfs2.patch
Patch152: virtinst-qed.patch
Patch153: virtinst-support-suse-distros.patch
Patch154: virtinst-detect-suse-distros.patch
Patch155: virtinst-xen-drive-type.patch
-Patch156: virtinst-allow-pv-iso-install.patch
+Patch156: virtinst-modify-gui-defaults.patch
+Patch157: virtinst-pvgrub2-bootloader.patch
+Patch158: virtinst-set-qemu-emulator.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define verrel %{version}-%{release}
Requires: virt-manager-common = %{verrel}
+Requires: avahi
Requires: gtk3
Requires: python-gconf
Requires: dconf
@@ -181,31 +160,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
%patch50 -p1
%patch51 -p1
%patch52 -p1
@@ -220,20 +174,22 @@
%patch67 -p1
%patch68 -p1
%patch69 -p1
-#%patch69 -p1 pv iso install
%patch70 -p1
%patch71 -p1
%patch72 -p1
%patch73 -p1
%patch74 -p1
%patch75 -p1
+%patch76 -p1
#%patch150 -p1 use 'c' for cdrom
%patch151 -p1
%patch152 -p1
%patch153 -p1
%patch154 -p1
%patch155 -p1
-#%patch156 -p1 pv iso install
+%patch156 -p1
+%patch157 -p1
+%patch158 -p1
%build
%if %{qemu_user}
++++++ 5332ee4d-enable-media-detection-for-ISO-images.patch ++++++
Subject: virt-manager: enable media detection for CD/ISO images
From: Giuseppe Scrivano gscri...@redhat.com Tue Mar 25 14:31:08 2014 +0100
Date: Wed Mar 26 16:12:13 2014 +0100:
Git: 6b5171031e7e688fd9c1c44aeec599dcb1a9e6cd
Signed-off-by: Giuseppe Scrivano <gscri...@redhat.com>
Index: virt-manager-1.0.1/virtManager/create.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/create.py
+++ virt-manager-1.0.1/virtManager/create.py
@@ -132,7 +132,7 @@ class vmmCreate(vmmGObjectUI):
"on_install_url_box_changed": self.url_box_changed,
"on_install_local_cdrom_toggled": self.toggle_local_cdrom,
"on_install_local_cdrom_combo_changed": self.detect_media_os,
- "on_install_local_box_changed": self.detect_media_os,
+ "on_install_local_box_changed": self.local_box_changed,
"on_install_local_browse_clicked": self.browse_iso,
"on_install_import_browse_clicked": self.browse_import,
"on_install_app_browse_clicked": self.browse_app,
@@ -543,6 +543,11 @@ class vmmCreate(vmmGObjectUI):
self.mediacombo = vmmMediaCombo(self.conn, self.builder, self.topwin,
MEDIA_CDROM)
+ def mediacombo_changed(src):
+ ignore = src
+ self.mediaDetected = False
+ self.detect_media_os()
+ self.mediacombo.combo.connect("changed", mediacombo_changed)
self.mediacombo.reset_state()
self.widget("install-local-cdrom-align").add(
self.mediacombo.top_box)
@@ -1109,16 +1114,22 @@ class vmmCreate(vmmGObjectUI):
self.change_caps(self.capsguest.os_type, arch)
- def url_box_changed(self, ignore):
+ def media_box_changed(self, widget):
self.mediaDetected = False
- # If the url_entry has focus, don't fire detect_media_os, it means
+ # If the widget has focus, don't fire detect_media_os, it means
# the user is probably typing
- if self.widget("install-url-box").get_child().has_focus():
+ if self.widget(widget).get_child().has_focus():
return
self.detect_media_os()
+ def url_box_changed(self, ignore):
+ self.media_box_changed("install-url-box")
+
+ def local_box_changed(self, ignore):
+ self.media_box_changed("install-local-box")
+
def should_detect_media(self):
return (self.is_detect_active() and not self.mediaDetected)
@@ -1182,6 +1193,7 @@ class vmmCreate(vmmGObjectUI):
is_active = src.get_active()
if is_active and self.mediacombo.get_path():
# Local CDROM was selected with media preset, detect distro
+ self.mediaDetected = False
self.detect_media_os()
self.widget("install-local-cdrom-align").set_sensitive(is_active)
@@ -1190,6 +1202,8 @@ class vmmCreate(vmmGObjectUI):
uselocal = src.get_active()
self.widget("install-local-box").set_sensitive(uselocal)
self.widget("install-local-browse").set_sensitive(uselocal)
+ self.mediaDetected = False
+ self.detect_media_os()
def detect_visibility_changed(self, src, ignore=None):
is_visible = src.get_visible()
@@ -1241,11 +1255,7 @@ class vmmCreate(vmmGObjectUI):
INSTALL_PAGE_CONTAINER_OS]
osbox.set_visible(iscontainer)
- # Detection only works/ is valid for URL,
- # FIXME: Also works for CDROM if running as root (since we need to
- # mount the iso/cdrom), but we should probably make this work for
- # more distros (like windows) before we enable it
- if (instpage == INSTALL_PAGE_URL):
+ if instpage in (INSTALL_PAGE_ISO, INSTALL_PAGE_URL):
detectbox.show()
else:
detectbox.hide()
++++++ 53341e7e-hide-hardware-removal-for-non-devices.patch ++++++
Subject: virtManager: hide "Remove Hardware" for non-devices
From: Giuseppe Scrivano gscri...@redhat.com Thu Mar 27 12:40:42 2014 +0100
Date: Thu Mar 27 13:50:06 2014 +0100:
Git: 37eecb215d137ffb6e98f36adfa37f96220d7287
The menu item "Remove Hardware" in the Overview window is valid only
when a hardware device is selected, hide it in any other case.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1081373
Signed-off-by: Giuseppe Scrivano <gscri...@redhat.com>
diff --git a/virtManager/details.py b/virtManager/details.py
index c1833ae..8c72efa 100644
--- a/virtManager/details.py
+++ b/virtManager/details.py
@@ -530,6 +530,7 @@ class vmmDetails(vmmGObjectUI):
self.oldhwkey = None
self.addhwmenu = None
+ self._addhwmenuitems = None
self.keycombo_menu = None
self.init_menus()
self.init_details()
@@ -706,6 +707,7 @@ class vmmDetails(vmmGObjectUI):
self.vm = None
self.conn = None
self.addhwmenu = None
+ self._addhwmenuitems = None
self.gfxdetails.cleanup()
self.gfxdetails = None
@@ -801,8 +803,9 @@ class vmmDetails(vmmGObjectUI):
rmHW.show()
rmHW.connect("activate", self.remove_xml_dev)
- self.addhwmenu.add(addHW)
- self.addhwmenu.add(rmHW)
+ self._addhwmenuitems = {"add" : addHW, "remove" : rmHW}
+ for i in self._addhwmenuitems.values():
+ self.addhwmenu.add(i)
# Don't allowing changing network/disks for Dom0
dom0 = self.vm.is_management_domain()
@@ -1075,6 +1078,16 @@ class vmmDetails(vmmGObjectUI):
if event.button != 3:
return
+ devobj = self.get_hw_selection(HW_LIST_COL_DEVICE)
+ if not devobj:
+ return
+
+ rmdev = self._addhwmenuitems["remove"]
+ if hasattr(devobj, "virtual_device_type"):
+ rmdev.show()
+ else:
+ rmdev.hide()
+
self.addhwmenu.popup(None, None, None, None, 0, event.time)
def control_fullscreen(self, src):
++++++ 53342f31-set-right-ip-address-for-ipv6.patch ++++++
Subject: createinterface: set right ip address for ipv6
From: Chen Hanxiao chenhanx...@cn.fujitsu.com Thu Mar 27 22:01:21 2014 +0800
Date: Thu Mar 27 22:01:21 2014 +0800:
Git: 58d8795b27b792bbbc89b93ac9333253df205943
We use v4_addr for building ipv6 addr.
This patch will use right ip address for ipv6.
Signed-off-by: Chen Hanxiao <chenhanx...@cn.fujitsu.com>
diff --git a/virtManager/createinterface.py b/virtManager/createinterface.py
index 77fb6e1..11fc9b2 100644
--- a/virtManager/createinterface.py
+++ b/virtManager/createinterface.py
@@ -818,9 +818,10 @@ class vmmCreateInterface(vmmGObjectUI):
if not ipv6.dhcp:
if v6_gate:
ipv6.gateway = v6_gate
- addr, prefix = build_ip(v4_addr)
- if addr:
- ipv6.add_ip(addr, prefix)
+ for v6_addr in v6_addrlist:
+ addr, prefix = build_ip(v6_addr)
+ if addr:
+ ipv6.add_ip(addr, prefix)
return [is_manual, copy_name, ipv4, ipv6, proto_xml]
++++++ virt-manager-1.0.0.tar.bz2 -> virt-manager-1.0.1.tar.bz2 ++++++
++++ 162567 lines of diff (skipped)
++++++ virtinst-detect-suse-distros.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,8 +1,8 @@
-Index: virt-manager-1.0.0/virtinst/urlfetcher.py
+Index: virt-manager-1.0.1/virtinst/urlfetcher.py
===================================================================
---- virt-manager-1.0.0.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.0.0/virtinst/urlfetcher.py
-@@ -296,6 +296,60 @@ def _distroFromTreeinfo(fetcher, arch, v
+--- virt-manager-1.0.1.orig/virtinst/urlfetcher.py
++++ virt-manager-1.0.1/virtinst/urlfetcher.py
+@@ -296,6 +296,68 @@ def _distroFromTreeinfo(fetcher, arch, v
return ob
@@ -37,20 +37,28 @@
+ distro_version = line.split(' ', 1)
+ if distribution:
+ break
++ if line.startswith("SUMMARY "):
++ distro_summary = line.split(' ', 1)
+
-+ if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \
-+ re.match(".*SUSE SLES*", distribution[1]):
-+ dclass = SLESDistro
-+ if distro_version is None:
-+ distro_version = ['VERSION', distribution[1].strip().rsplit('
')[4]]
-+ elif re.match(".*SUSE Linux Enterprise Desktop*", distribution[1]):
-+ dclass = SLEDDistro
-+ if distro_version is None:
-+ distro_version = ['VERSION', distribution[1].strip().rsplit('
')[4]]
-+ elif re.match(".*openSUSE.*", distribution[1]):
-+ dclass = OpensuseDistro
-+ else:
-+ dclass = GenericDistro
++ if not distribution and distro_summary:
++ distribution = distro_summary
++
++ if distribution:
++ if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \
++ re.match(".*SUSE SLES*", distribution[1]):
++ dclass = SLESDistro
++ if distro_version is None:
++ distro_version = ['VERSION', distribution[1].strip().rsplit('
')[4]]
++ elif re.match(".*SUSE Linux Enterprise Desktop*", distribution[1]):
++ dclass = SLEDDistro
++ if distro_version is None:
++ distro_version = ['VERSION', distribution[1].strip().rsplit('
')[4]]
++ elif re.match(".*openSUSE.*", distribution[1]):
++ dclass = OpensuseDistro
++ if distro_version is None:
++ distro_version = ['VERSION', '13.1']
++ else:
++ dclass = GenericDistro
+
+ ob = dclass(fetcher, arch, vmtype)
+ if dclass != GenericDistro:
@@ -63,7 +71,7 @@
def getDistroStore(guest, fetcher):
stores = []
-@@ -312,6 +366,10 @@ def getDistroStore(guest, fetcher):
+@@ -312,6 +374,10 @@ def getDistroStore(guest, fetcher):
if dist:
return dist
@@ -74,7 +82,7 @@
# FIXME: This 'distro ==' doesn't cut it. 'distro' is from our os
# dictionary, so would look like 'fedora9' or 'rhel5', so this needs
# to be a bit more intelligent
-@@ -808,12 +866,11 @@ class SLDistro(RHELDistro):
+@@ -808,12 +874,11 @@ class SLDistro(RHELDistro):
class SuseDistro(Distro):
name = "SUSE"
@@ -88,7 +96,7 @@
Distro.__init__(self, *args, **kwargs)
if re.match(r'i[4-9]86', self.arch):
self.arch = 'i386'
-@@ -824,18 +881,32 @@ class SuseDistro(Distro):
+@@ -824,18 +889,34 @@ class SuseDistro(Distro):
oldkern += "64"
oldinit += "64"
@@ -121,6 +129,8 @@
def isValidStore(self):
+ # self.content is the VERSION line from the contents file
++ if self.content is None or self.content[1] is None:
++ return False
+ distro_version = self.content[1]
+ version = distro_version.split('.', 1)[0].strip()
+ if int(version) >= 10:
@@ -131,7 +141,7 @@
if not self.fetcher.hasFile("directory.yast"):
return False
-@@ -860,6 +931,27 @@ class SuseDistro(Distro):
+@@ -860,6 +941,27 @@ class SuseDistro(Distro):
return name
return self.os_variant
++++++ virtinst-modify-gui-defaults.patch ++++++
Index: virt-manager-1.0.1/virtManager/create.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/create.py
+++ virt-manager-1.0.1/virtManager/create.py
@@ -337,7 +337,18 @@ class vmmCreate(vmmGObjectUI):
self.widget("method-local").set_active(True)
self.widget("create-conn").set_active(-1)
activeconn = self.populate_conn_list(urihint)
- self.widget("arch-expander").set_expanded(False)
+ if activeconn and activeconn.is_xen():
+ self.widget("arch-expander").set_expanded(True)
+ else:
+ self.widget("arch-expander").set_expanded(False)
+
+ # Default to Network install if host was installed that way
+ host_instsrc = util.getHostInstallSource()
+ if host_instsrc is not None and \
+ (host_instsrc.startswith('ftp:') or
host_instsrc.startswith('http:') or \
+ host_instsrc.startswith('smb:') or
host_instsrc.startswith('nfs:')):
+ self.widget("method-local").set_active(False)
+ self.widget("method-tree").set_active(True)
try:
self.set_conn(activeconn, force_validate=True)
Index: virt-manager-1.0.1/virtManager/netlist.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/netlist.py
+++ virt-manager-1.0.1/virtManager/netlist.py
@@ -174,10 +174,20 @@ class vmmNetworkList(vmmGObjectUI):
if nic.target_dev and nic.target_dev not in vnet_taps:
vnet_taps.append(nic.target_dev)
+ def check_for_inet(bname):
+ if bname is not None:
+ from subprocess import Popen, PIPE
+ p = Popen(['/sbin/ip', 'addr', 'show', bname], stdout=PIPE,
stderr=PIPE)
+ stdout, stderr = p.communicate()
+ if stdout and 'inet' in stdout:
+ return True
+ return False
+
bridge_dict = {}
iface_dict = {}
hasShared = False
brIdxLabel = None
+ brIdxLabel_with_inet = None
skip_ifaces = ["lo"]
for name in self.conn.list_net_device_paths():
@@ -218,6 +228,11 @@ class vmmNetworkList(vmmGObjectUI):
if hasShared and not brIdxLabel:
brIdxLabel = label
+ # Default to a bridge that has an actual inet addr
+ if brIdxLabel_with_inet is None:
+ if check_for_inet(bridge_name):
+ brIdxLabel_with_inet = label
+
row = self._build_source_row(
nettype, bridge_name, label, sensitive, True,
key=br.get_name())
@@ -227,6 +242,9 @@ class vmmNetworkList(vmmGObjectUI):
else:
iface_dict[label] = row
+ if brIdxLabel and brIdxLabel_with_inet is not None:
+ brIdxLabel = brIdxLabel_with_inet
+
return bridge_dict, iface_dict, brIdxLabel
def _populate_network_list(self):
++++++ virtinst-pvgrub2-bootloader.patch ++++++
Index: virt-manager-1.0.1/virtinst/guest.py
===================================================================
--- virt-manager-1.0.1.orig/virtinst/guest.py
+++ virt-manager-1.0.1/virtinst/guest.py
@@ -331,7 +331,16 @@ class Guest(XMLBuilder):
this.)
@type disk_boot: C{bool}
"""
- osblob_install = install and not disk_boot
+ boot_pvgrub2 = False
+ if install == False and self.os.is_xenpv():
+ os_ver = self._get_os_variant()
+ if os_ver == "sles12" or os_ver == "sled12":
+ boot_pvgrub2 = True
+ self.installer._install_kernel =
"/usr/lib/grub2/x86_64-xen/grub.xen"
+ self.installer._install_initrd = None
+ self.installer.extraargs = None
+ logging.info("Using grub.xen to boot guest")
+ osblob_install = (install or boot_pvgrub2) and not disk_boot
if osblob_install and not self.installer.has_install_phase():
return None
@@ -348,7 +357,8 @@ class Guest(XMLBuilder):
if (not install and
self.os.is_xenpv() and
not self.os.kernel):
- self.bootloader = "/usr/bin/pygrub"
+ if boot_pvgrub2 is False:
+ self.bootloader = "/usr/bin/pygrub"
self.os.clear()
return self.get_xml_config()
++++++ virtinst-set-qemu-emulator.patch ++++++
Index: virt-manager-1.0.1/virtinst/guest.py
===================================================================
--- virt-manager-1.0.1.orig/virtinst/guest.py
+++ virt-manager-1.0.1/virtinst/guest.py
@@ -19,6 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA.
+import os
import logging
import urlgrabber.progress as progress
@@ -724,12 +725,13 @@ class Guest(XMLBuilder):
self.emulator = None
return
- if self.emulator:
+ preferred_emulator = "/usr/lib/xen/bin/qemu-system-i386"
+ if self.emulator and self.emulator == preferred_emulator:
return
if self.os.is_hvm() and self.type == "xen":
- if self.conn.caps.host.cpu.arch == "x86_64":
- self.emulator = "/usr/lib64/xen/bin/qemu-dm"
+ if os.path.exists(preferred_emulator):
+ self.emulator = preferred_emulator
else:
self.emulator = "/usr/lib/xen/bin/qemu-dm"
++++++ virtinst-xen-drive-type.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -21,7 +21,7 @@
http://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html
"""
if self.driver_name != self.DRIVER_QEMU:
-+ if self.type != 'file':
++ if self.driver_name and self.type != 'file':
+ return self.type
return None
++++++ virtman-autorestart.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,15 +1,13 @@
-Index: virt-manager-1.0.0/virtManager/details.py
+Index: virt-manager-1.0.1/virtManager/details.py
===================================================================
---- virt-manager-1.0.0.orig/virtManager/details.py
-+++ virt-manager-1.0.0/virtManager/details.py
-@@ -2018,12 +2018,10 @@ class vmmDetails(vmmGObjectUI):
+--- virt-manager-1.0.1.orig/virtManager/details.py
++++ virt-manager-1.0.1/virtManager/details.py
+@@ -2047,10 +2047,10 @@ class vmmDetails(vmmGObjectUI):
+ return self._change_config_helper(self.vm.define_memory, kwargs,
+ hotplug_args=hotplug_args)
- return self._change_config_helper(df, da, hf, ha)
-
-- # Boot device / Autostart
- def config_boot_options_apply(self):
-- df, da, add_define, hf, ha, add_hotplug = self.make_apply_data()
-- ignore = add_hotplug
+- kwargs = {}
-
- if self.edited(EDIT_AUTOSTART):
+ # Autostart - See bnc#624250 - L3: virt-manager doesn't update
@@ -19,19 +17,17 @@
auto = self.widget("config-autostart")
try:
self.vm.set_autostart(auto.get_active())
-@@ -2032,6 +2030,11 @@ class vmmDetails(vmmGObjectUI):
+@@ -2059,6 +2059,9 @@ class vmmDetails(vmmGObjectUI):
(_("Error changing autostart value: %s") % str(e)))
return False
-+ # Boot device
+ def config_boot_options_apply(self):
-+ df, da, add_define, hf, ha, add_hotplug = self.make_apply_data()
-+ ignore = add_hotplug
++ kwargs = {}
+
if self.edited(EDIT_BOOTORDER):
- bootdevs = self.get_config_boot_order()
- add_define(self.vm.set_boot_order, bootdevs)
-@@ -2386,6 +2389,8 @@ class vmmDetails(vmmGObjectUI):
+ kwargs["boot_order"] = self.get_config_boot_order()
+
+@@ -2372,6 +2375,8 @@ class vmmDetails(vmmGObjectUI):
buttons=Gtk.ButtonsType.OK,
dialog_type=dtype)
@@ -39,4 +35,4 @@
+
return True
- ########################
+
++++++ virtman-autoyast-support.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,8 +1,8 @@
-Index: virt-manager-1.0.0/virtManager/create.py
+Index: virt-manager-1.0.1/virtManager/create.py
===================================================================
---- virt-manager-1.0.0.orig/virtManager/create.py
-+++ virt-manager-1.0.0/virtManager/create.py
-@@ -1232,11 +1232,34 @@ class vmmCreate(vmmGObjectUI):
+--- virt-manager-1.0.1.orig/virtManager/create.py
++++ virt-manager-1.0.1/virtManager/create.py
+@@ -1227,11 +1227,34 @@ class vmmCreate(vmmGObjectUI):
variant = self.widget("install-os-version")
variant.set_active(0)
@@ -37,7 +37,7 @@
# Get previous
type_row = self._selected_os_row()
if not type_row:
-@@ -1591,7 +1614,10 @@ class vmmCreate(vmmGObjectUI):
+@@ -1585,7 +1608,10 @@ class vmmCreate(vmmGObjectUI):
if extra:
extraargs += extra
if ks:
@@ -49,7 +49,7 @@
if extraargs:
self.guest.installer.extraargs = extraargs
-@@ -1984,6 +2010,7 @@ class vmmCreate(vmmGObjectUI):
+@@ -1981,6 +2007,7 @@ class vmmCreate(vmmGObjectUI):
dl = self.set_os_val(self.widget("install-os-type"), distro_type)
vl = self.set_os_val(self.widget("install-os-version"), distro_var)
self.set_distro_labels(dl, vl)
@@ -57,10 +57,10 @@
def check_detection(self, idx, forward):
results = None
-Index: virt-manager-1.0.0/ui/create.ui
+Index: virt-manager-1.0.1/ui/create.ui
===================================================================
---- virt-manager-1.0.0.orig/ui/create.ui
-+++ virt-manager-1.0.0/ui/create.ui
+--- virt-manager-1.0.1.orig/ui/create.ui
++++ virt-manager-1.0.1/ui/create.ui
@@ -869,7 +869,7 @@ bar</property>
<property
name="column_spacing">6</property>
<property
name="row_spacing">4</property>
++++++ virtman-cdrom.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,8 +1,8 @@
-Index: virt-manager-0.10.1/virtManager/addhardware.py
+Index: virt-manager-1.0.1/virtManager/addhardware.py
===================================================================
---- virt-manager-0.10.1.orig/virtManager/addhardware.py
-+++ virt-manager-0.10.1/virtManager/addhardware.py
-@@ -778,7 +778,7 @@ class vmmAddHardware(vmmGObjectUI):
+--- virt-manager-1.0.1.orig/virtManager/addhardware.py
++++ virt-manager-1.0.1/virtManager/addhardware.py
+@@ -760,7 +760,7 @@ class vmmAddHardware(vmmGObjectUI):
disk_buses = ["ide", "sata", "scsi", "sd",
"usb", "virtio", "virtio-scsi", "xen"]
floppy_buses = ["fdc"]
++++++ virtman-default-guest-from-host-os.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,7 +1,7 @@
-Index: virt-manager-1.0.0/virtManager/create.py
+Index: virt-manager-1.0.1/virtManager/create.py
===================================================================
---- virt-manager-1.0.0.orig/virtManager/create.py
-+++ virt-manager-1.0.0/virtManager/create.py
+--- virt-manager-1.0.1.orig/virtManager/create.py
++++ virt-manager-1.0.1/virtManager/create.py
@@ -21,6 +21,8 @@
import logging
import threading
@@ -11,7 +11,7 @@
# pylint: disable=E0611
from gi.repository import GObject
-@@ -1130,6 +1132,55 @@ class vmmCreate(vmmGObjectUI):
+@@ -1140,6 +1142,55 @@ class vmmCreate(vmmGObjectUI):
return
self.start_detection(forward=forward)
@@ -67,7 +67,7 @@
def toggle_detect_os(self, src):
dodetect = src.get_active()
-@@ -1141,6 +1192,8 @@ class vmmCreate(vmmGObjectUI):
+@@ -1151,6 +1202,8 @@ class vmmCreate(vmmGObjectUI):
if dodetect:
self.mediaDetected = False
self.detect_media_os()
++++++ virtman-default-to-xen-pv.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,14 +1,14 @@
-Index: virt-manager-1.0.0/virtManager/create.py
+Index: virt-manager-1.0.1/virtManager/create.py
===================================================================
---- virt-manager-1.0.0.orig/virtManager/create.py
-+++ virt-manager-1.0.0/virtManager/create.py
-@@ -855,7 +855,12 @@ class vmmCreate(vmmGObjectUI):
- # If none specified, prefer HVM. This way, the default install
- # options won't be limited because we default to PV. If hvm not
- # supported, differ to guest_lookup
+--- virt-manager-1.0.1.orig/virtManager/create.py
++++ virt-manager-1.0.1/virtManager/create.py
+@@ -862,7 +862,12 @@ class vmmCreate(vmmGObjectUI):
+ if gtype is None:
+ # If none specified, prefer HVM so install options aren't limited
+ # with a default PV choice.
+ # If xen connection, favor PV installation
+ conn_is_xen = self.conn.is_xen()
- for g in self.caps.guests:
+ for g in self.conn.caps.guests:
+ if conn_is_xen and g.os_type == "xen":
+ gtype = "xen"
+ break
++++++ virtman-device-flags.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,8 +1,8 @@
-Index: virt-manager-1.0.0/virtManager/addhardware.py
+Index: virt-manager-1.0.1/virtManager/addhardware.py
===================================================================
---- virt-manager-1.0.0.orig/virtManager/addhardware.py
-+++ virt-manager-1.0.0/virtManager/addhardware.py
-@@ -1287,6 +1287,18 @@ class vmmAddHardware(vmmGObjectUI):
+--- virt-manager-1.0.1.orig/virtManager/addhardware.py
++++ virt-manager-1.0.1/virtManager/addhardware.py
+@@ -1276,6 +1276,18 @@ class vmmAddHardware(vmmGObjectUI):
if controller is not None:
logging.debug("Adding controller:\n%s",
controller.get_xml_config())
@@ -21,11 +21,11 @@
# Hotplug device
attach_err = False
try:
-Index: virt-manager-1.0.0/virtManager/details.py
+Index: virt-manager-1.0.1/virtManager/details.py
===================================================================
---- virt-manager-1.0.0.orig/virtManager/details.py
-+++ virt-manager-1.0.0/virtManager/details.py
-@@ -2279,6 +2279,17 @@ class vmmDetails(vmmGObjectUI):
+--- virt-manager-1.0.1.orig/virtManager/details.py
++++ virt-manager-1.0.1/virtManager/details.py
+@@ -2281,6 +2281,17 @@ class vmmDetails(vmmGObjectUI):
text1=(_("Are you sure you want to remove this device?"))):
return
@@ -42,12 +42,12 @@
+
# Define the change
try:
- self.vm.remove_device(dev_id_info)
-Index: virt-manager-1.0.0/virtManager/domain.py
+ self.vm.remove_device(devobj)
+Index: virt-manager-1.0.1/virtManager/domain.py
===================================================================
---- virt-manager-1.0.0.orig/virtManager/domain.py
-+++ virt-manager-1.0.0/virtManager/domain.py
-@@ -898,6 +898,10 @@ class vmmDomain(vmmLibvirtObject):
+--- virt-manager-1.0.1.orig/virtManager/domain.py
++++ virt-manager-1.0.1/virtManager/domain.py
+@@ -928,6 +928,10 @@ class vmmDomain(vmmLibvirtObject):
devxml = devobj.get_xml_config()
self._backend.attachDevice(devxml)
@@ -58,14 +58,14 @@
def detach_device(self, devobj):
"""
Hotunplug device from running guest
-@@ -916,6 +920,10 @@ class vmmDomain(vmmLibvirtObject):
- xml = devobj.get_xml_config()
+@@ -946,6 +950,10 @@ class vmmDomain(vmmLibvirtObject):
+ logging.debug("Calling update_device with xml=\n%s", xml)
self._backend.updateDeviceFlags(xml, flags)
+ def detach_device_flags(self, devtype, dev_id_info, flags):
+ xml = self._get_device_xml(devtype, dev_id_info)
+ self._backend.detachDeviceFlags(xml, flags)
+
- def hotplug_vcpus(self, vcpus):
- vcpus = int(vcpus)
- if vcpus != self.vcpu_count():
+ def hotplug(self, vcpus=_SENTINEL, memory=_SENTINEL, maxmem=_SENTINEL,
+ description=_SENTINEL, title=_SENTINEL, storage_path=_SENTINEL,
+ device=_SENTINEL):
++++++ virtman-eepro100.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,8 +1,8 @@
-Index: virt-manager-0.10.1/virtManager/addhardware.py
+Index: virt-manager-1.0.1/virtManager/addhardware.py
===================================================================
---- virt-manager-0.10.1.orig/virtManager/addhardware.py
-+++ virt-manager-0.10.1/virtManager/addhardware.py
-@@ -553,6 +553,7 @@ class vmmAddHardware(vmmGObjectUI):
+--- virt-manager-1.0.1.orig/virtManager/addhardware.py
++++ virt-manager-1.0.1/virtManager/addhardware.py
+@@ -555,6 +555,7 @@ class vmmAddHardware(vmmGObjectUI):
if vm.is_hvm():
mod_list = ["rtl8139", "ne2k_pci", "pcnet", "e1000"]
if vm.get_hv_type() in ["kvm", "qemu", "test"]:
++++++ virtman-init-vm-processor-topology.patch ++++++
Index: virt-manager-1.0.1/virtManager/details.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/details.py
+++ virt-manager-1.0.1/virtManager/details.py
@@ -2564,13 +2564,6 @@ class vmmDetails(vmmGObjectUI):
def refresh_config_cpu(self):
conn = self.vm.conn
host_active_count = conn.host_active_processor_count()
- maxvcpus = self.vm.vcpu_max_count()
- curvcpus = self.vm.vcpu_count()
-
- curadj = self.widget("config-vcpus")
- maxadj = self.widget("config-maxvcpus")
- curadj.set_value(int(curvcpus))
- maxadj.set_value(int(maxvcpus))
self.widget("state-host-cpus").set_text(str(host_active_count))
@@ -2592,6 +2585,14 @@ class vmmDetails(vmmGObjectUI):
if show_top:
self.widget("cpu-topology-expander").set_expanded(True)
+ maxvcpus = self.vm.vcpu_max_count()
+ curvcpus = self.vm.vcpu_count()
+
+ curadj = self.widget("config-vcpus")
+ maxadj = self.widget("config-maxvcpus")
+ curadj.set_value(int(curvcpus))
+ maxadj.set_value(int(maxvcpus))
+
model = cpu.model or None
if not model:
if cpu.mode == "host-model" or cpu.mode == "host-passthrough":
++++++ virtman-keycombo.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,8 +1,8 @@
-Index: virt-manager-0.10.1/virtManager/console.py
+Index: virt-manager-1.0.1/virtManager/console.py
===================================================================
---- virt-manager-0.10.1.orig/virtManager/console.py
-+++ virt-manager-0.10.1/virtManager/console.py
-@@ -922,6 +922,16 @@ class vmmConsolePages(vmmGObjectUI):
+--- virt-manager-1.0.1.orig/virtManager/console.py
++++ virt-manager-1.0.1/virtManager/console.py
+@@ -935,6 +935,16 @@ class vmmConsolePages(vmmGObjectUI):
make_item("Ctrl+Alt+_Backspace", ["Control_L", "Alt_L", "BackSpace"])
make_item("Ctrl+Alt+_Delete", ["Control_L", "Alt_L", "Delete"])
menu.add(Gtk.SeparatorMenuItem())
++++++ virtman-qed.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,8 +1,8 @@
-Index: virt-manager-0.10.1/virtManager/addhardware.py
+Index: virt-manager-1.0.1/virtManager/addhardware.py
===================================================================
---- virt-manager-0.10.1.orig/virtManager/addhardware.py
-+++ virt-manager-0.10.1/virtManager/addhardware.py
-@@ -717,11 +717,14 @@ class vmmAddHardware(vmmGObjectUI):
+--- virt-manager-1.0.1.orig/virtManager/addhardware.py
++++ virt-manager-1.0.1/virtManager/addhardware.py
+@@ -700,11 +700,14 @@ class vmmAddHardware(vmmGObjectUI):
combo.set_model(model)
uiutil.set_combo_text_column(combo, 0)
++++++ virtman-show-suse-install-repos.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,7 +1,7 @@
-Index: virt-manager-1.0.0/virtManager/create.py
+Index: virt-manager-1.0.1/virtManager/create.py
===================================================================
---- virt-manager-1.0.0.orig/virtManager/create.py
-+++ virt-manager-1.0.0/virtManager/create.py
+--- virt-manager-1.0.1.orig/virtManager/create.py
++++ virt-manager-1.0.1/virtManager/create.py
@@ -18,6 +18,7 @@
# MA 02110-1301 USA.
#
@@ -10,7 +10,7 @@
import logging
import threading
import time
-@@ -366,7 +367,13 @@ class vmmCreate(vmmGObjectUI):
+@@ -365,7 +366,13 @@ class vmmCreate(vmmGObjectUI):
self.widget("install-url-options").set_expanded(False)
urlmodel = self.widget("install-url-box").get_model()
ksmodel = self.widget("install-ks-box").get_model()
@@ -25,10 +25,10 @@
self.populate_media_model(ksmodel, self.config.get_kickstart_urls())
self.set_distro_labels("-", "-", force=True)
-Index: virt-manager-1.0.0/virtinst/util.py
+Index: virt-manager-1.0.1/virtinst/util.py
===================================================================
---- virt-manager-1.0.0.orig/virtinst/util.py
-+++ virt-manager-1.0.0/virtinst/util.py
+--- virt-manager-1.0.1.orig/virtinst/util.py
++++ virt-manager-1.0.1/virtinst/util.py
@@ -23,12 +23,14 @@ import os
import random
import re
@@ -44,7 +44,7 @@
def listify(l):
-@@ -531,3 +533,92 @@ def convert_units(value, old_unit, new_u
+@@ -531,3 +533,96 @@ def convert_units(value, old_unit, new_u
power = get_power(new_unit)
return in_bytes / pow(factor, power)
@@ -53,6 +53,8 @@
+ global _host_repo_url
+ if _host_repo_url is not None:
+ return _host_repo_url
++ if os.geteuid() != 0:
++ return None
+
+ if os.path.exists('/var/lib/YaST2/install.inf'):
+ server_ip = server_name = server_dir = inst_mode = None
@@ -102,6 +104,8 @@
+ return None
+
+def getInstallRepos(enabled_sources_only = True):
++ if os.geteuid() != 0:
++ return (0, [])
+ dom0_inst_source = getHostInstallSource()
+ locations = commands.getoutput("/usr/bin/zypper lr -u | awk -F'|' '{
print $6 }'")
+ locations = locations[(locations.rfind('URI')):].split()
++++++ virtman-stable-os-support.patch ++++++
--- virt-manager-1.0.0/virtManager/create.py.orig 2014-03-21
10:30:13.000000000 -0600
+++ virt-manager-1.0.0/virtManager/create.py 2014-03-21 10:56:45.000000000
-0600
@@ -66,8 +66,9 @@ INSTALL_PAGE_CONTAINER_APP = 4
INSTALL_PAGE_CONTAINER_OS = 5
STABLE_OS_SUPPORT = [
- "rhel3", "rhel4", "rhel5.4", "rhel6",
- "win2k3", "winxp", "win2k8", "vista", "win7",
+ "oes11", "sles10", "sles11", "sles12",
+ "sled10", "sled11", "sled12",
+ "win2k3", "win2k8", "win2k12", "win7", "win8",
]
++++++ virtman-update-backend.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -1,8 +1,8 @@
-Index: virt-manager-1.0.0/virtManager/domain.py
+Index: virt-manager-1.0.1/virtManager/domain.py
===================================================================
---- virt-manager-1.0.0.orig/virtManager/domain.py
-+++ virt-manager-1.0.0/virtManager/domain.py
-@@ -1849,7 +1849,14 @@ class vmmDomain(vmmLibvirtObject):
+--- virt-manager-1.0.1.orig/virtManager/domain.py
++++ virt-manager-1.0.1/virtManager/domain.py
+@@ -1892,7 +1892,14 @@ class vmmDomain(vmmLibvirtObject):
info = []
if not self._using_events() or self._enable_cpu_stats:
++++++ virtman-vminstall.patch ++++++
--- /var/tmp/diff_new_pack.VGVNh5/_old 2014-03-30 12:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.VGVNh5/_new 2014-03-30 12:29:50.000000000 +0200
@@ -161,7 +161,7 @@
+ self._get_create_dialog().show(src.topwin, uri)
+ self.remote_install = True
+ else:
-+ if os.getuid() == 0:
++ if os.geteuid() == 0:
+ args = ['/usr/bin/vm-install']
+ logging.debug("Launching: %s" % str(args))
+ p = Popen(args)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
