Hello community,
here is the log from the commit of package virt-manager for openSUSE:Factory
checked in at 2015-09-30 05:51:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-09-13 09:45:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes
2015-09-30 05:51:41.000000000 +0200
@@ -1,0 +2,30 @@
+Wed Sep 23 10:25:33 MDT 2015 - carn...@suse.com
+
+- bsc#947129 - Error launching manager: 'URI' is not in list
+ virtman-show-suse-install-repos.patch
+
+-------------------------------------------------------------------
+Tue Sep 22 11:07:01 MDT 2015 - carn...@suse.com
+
+- bsc#919420 - virt-manager: installation of vm on pp64le: Couldn't
+ find hvm kernel for SUSE tree.
+ virtinst-add-ppc64-arch-support.patch
+- Upstream bug fix to console if running on Xen
+ 601a82cb-fix-console_type-if-xen.patch
+
+-------------------------------------------------------------------
+Wed Sep 16 10:01:56 MDT 2015 - carn...@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 - cy...@suse.com
+
+- bsc#944670: virt-install does not work on SLES 12 SP1 beta3 xen
+ 590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch
+
+-------------------------------------------------------------------
New:
----
590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch
601a82cb-fix-console_type-if-xen.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.WKI7Gb/_old 2015-09-30 05:51:42.000000000 +0200
+++ /var/tmp/diff_new_pack.WKI7Gb/_new 2015-09-30 05:51:42.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package virt-manager
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -49,6 +49,8 @@
Patch10: eb92178e-virtinst-fix-storage-pool-lookup.patch
Patch11: 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch
Patch12: 360fe110-add-s390x-arch-support.patch
+Patch13:
590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch
+Patch14: 601a82cb-fix-console_type-if-xen.patch
# SUSE Only
Patch70: virtman-desktop.patch
Patch71: virtman-kvm.patch
@@ -132,6 +134,7 @@
Requires: python-ipaddr
Requires: python-libxml2
Requires: python-urlgrabber
+Requires: typelib(LibvirtGLib)
%if 0%{?is_opensuse}
BuildRequires: gobject-introspection
%else
@@ -139,7 +142,6 @@
Requires: typelib(GVnc)
Requires: typelib(GtkVnc)
Requires: typelib(Libosinfo)
-Requires: typelib(LibvirtGLib)
Requires: typelib(SpiceClientGtk)
Requires: typelib(Vte)
%endif
@@ -182,6 +184,8 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
+%patch14 -p1
# SUSE Only
%patch70 -p1
%patch71 -p1
++++++ 590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch
++++++
>From 590f5a525bccded6866461b4ff3e1bb7adae086b Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobi...@redhat.com>
Date: Mon, 14 Sep 2015 10:34:19 -0400
Subject: [PATCH] urlfetcher: Clear cached ftp connection on cleanupLocation
Reported-by: Chun Yan Liu <cy...@suse.com>
---
virtinst/urlfetcher.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py
index 40f7c05..cda67a2 100644
--- a/virtinst/urlfetcher.py
+++ b/virtinst/urlfetcher.py
@@ -167,6 +167,7 @@ class _FTPImageFetcher(_URIImageFetcher):
except:
logging.debug("Error quitting ftp connection", exc_info=True)
+ self.ftp = None
def hasFile(self, filename):
path = self._make_path(filename)
--
1.8.5.6
++++++ 601a82cb-fix-console_type-if-xen.patch ++++++
Subject: virt-install: Simplify --extra-args text install warnings
From: Cole Robinson crobi...@redhat.com Tue Sep 22 08:42:09 2015 -0400
Date: Tue Sep 22 12:44:33 2015 -0400:
Git: 601a82cb87ebc055ba9dd52864317bd513613814
- Drop the warnings about incorrect console=, that's a little too fine
grained and was really only about virtio-console default confusion
which doesn't apply anymore
- Skip the check for xenpv which seems to always 'just work'
- Drop the opencoded arm check, use is_arm
- Fix an error when xen HVM is used (reported on virt-tools-list)
diff --git a/virt-install b/virt-install
index ba9423e..d509256 100755
--- a/virt-install
+++ b/virt-install
@@ -513,35 +513,20 @@ def _show_nographics_warnings(options, guest):
serial_arg = "console=ttyS0"
serial_arm_arg = "console=ttyAMA0"
- virtio_arg = "console=hvc0"
- console_type = None
- if guest.conn.is_test() or guest.conn.is_qemu():
- console_type = serial_arg
- if guest.os.arch.startswith("arm") or guest.os.arch == "aarch64":
- console_type = serial_arm_arg
- if guest.get_devices("console")[0].target_type == "virtio":
- console_type = virtio_arg
-
- if not options.extra_args or "console=" not in options.extra_args:
- logging.warn(_("No 'console' seen in --extra-args, a '%s' kernel "
- "argument is likely required to see text install output from "
- "the guest."), console_type or "console=")
- return
+ hvc_arg = "console=hvc0"
- if console_type in options.extra_args:
- return
- if (serial_arg not in options.extra_args and
- virtio_arg not in options.extra_args):
+ console_type = serial_arg
+ if guest.os.is_arm():
+ console_type = serial_arm_arg
+ if guest.get_devices("console")[0].target_type in ["virtio", "xen"]:
+ console_type = hvc_arg
+
+ if console_type in (options.extra_args or ""):
return
- has = (serial_arg in options.extra_args) and serial_arg or virtio_arg
- need = (serial_arg in options.extra_args) and virtio_arg or serial_arg
- logging.warn(_("'%s' found in --extra-args, but the device attached "
- "to the guest likely requires '%s'. You may not see text install "
- "output from the guest."), has, need)
- if has == serial_arg:
- logging.warn(_("To make '--extra-args %s' work, you can force a "
- "plain serial device with '--console pty'"), serial_arg)
+ logging.warn(_("Did not find '%(console_string)s' in --extra-args, "
+ "which is likely required to see text install output from the "
+ "guest."), {"console_string": console_type})
def show_warnings(options, guest):
++++++ virtinst-add-default-rng-device.patch ++++++
--- /var/tmp/diff_new_pack.WKI7Gb/_old 2015-09-30 05:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.WKI7Gb/_new 2015-09-30 05:51:43.000000000 +0200
@@ -12,7 +12,7 @@
class Guest(XMLBuilder):
-@@ -670,6 +671,15 @@ class Guest(XMLBuilder):
+@@ -671,6 +672,15 @@ class Guest(XMLBuilder):
return
self.add_device(VirtualGraphics(self.conn))
@@ -28,7 +28,7 @@
def add_default_devices(self):
self.add_default_graphics()
self.add_default_video_device()
-@@ -677,6 +687,7 @@ class Guest(XMLBuilder):
+@@ -678,6 +688,7 @@ class Guest(XMLBuilder):
self.add_default_console_device()
self.add_default_usb_controller()
self.add_default_channels()
++++++ virtinst-add-ppc64-arch-support.patch ++++++
--- /var/tmp/diff_new_pack.WKI7Gb/_old 2015-09-30 05:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.WKI7Gb/_new 2015-09-30 05:51:43.000000000 +0200
@@ -4,7 +4,7 @@
===================================================================
--- virt-manager-1.2.1.orig/virtinst/urlfetcher.py
+++ virt-manager-1.2.1/virtinst/urlfetcher.py
-@@ -373,6 +373,10 @@ def _distroFromSUSEContent(fetcher, arch
+@@ -374,6 +374,10 @@ def _distroFromSUSEContent(fetcher, arch
arch = "i586"
elif cbuf.find("s390x") != -1:
arch = "s390x"
@@ -15,7 +15,7 @@
dclass = GenericDistro
if distribution:
-@@ -942,10 +946,12 @@ class SuseDistro(Distro):
+@@ -943,10 +947,12 @@ class SuseDistro(Distro):
oldkern += "64"
oldinit += "64"
++++++ virtinst-detect-oes-distros.patch ++++++
--- /var/tmp/diff_new_pack.WKI7Gb/_old 2015-09-30 05:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.WKI7Gb/_new 2015-09-30 05:51:43.000000000 +0200
@@ -4,7 +4,7 @@
===================================================================
--- virt-manager-1.2.1.orig/virtinst/urlfetcher.py
+++ virt-manager-1.2.1/virtinst/urlfetcher.py
-@@ -385,6 +385,10 @@ def _distroFromSUSEContent(fetcher, arch
+@@ -386,6 +386,10 @@ def _distroFromSUSEContent(fetcher, arch
dclass = SLEDDistro
if distro_version is None:
distro_version = ['VERSION', distribution[1].strip().rsplit('
')[4]]
++++++ virtinst-nfs-install-sanitize.patch ++++++
--- /var/tmp/diff_new_pack.WKI7Gb/_old 2015-09-30 05:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.WKI7Gb/_new 2015-09-30 05:51:43.000000000 +0200
@@ -5,11 +5,11 @@
and carry the latter form around internally"
We need the RFC version to work correctly whereas redhat's anaconda
needs their own modified version.
-Index: virt-manager-1.2.0/virtinst/util.py
+Index: virt-manager-1.2.1/virtinst/util.py
===================================================================
---- virt-manager-1.2.0.orig/virtinst/util.py
-+++ virt-manager-1.2.0/virtinst/util.py
-@@ -559,3 +559,22 @@ def getInstallRepos(enabled_sources_only
+--- virt-manager-1.2.1.orig/virtinst/util.py
++++ virt-manager-1.2.1/virtinst/util.py
+@@ -558,3 +558,22 @@ def getInstallRepos(enabled_sources_only
zypper_output.insert(0, dom0_inst_source)
return (index_dom0, zypper_output)
@@ -32,10 +32,10 @@
+
+ return url
+
-Index: virt-manager-1.2.0/virtinst/distroinstaller.py
+Index: virt-manager-1.2.1/virtinst/distroinstaller.py
===================================================================
---- virt-manager-1.2.0.orig/virtinst/distroinstaller.py
-+++ virt-manager-1.2.0/virtinst/distroinstaller.py
+--- virt-manager-1.2.1.orig/virtinst/distroinstaller.py
++++ virt-manager-1.2.1/virtinst/distroinstaller.py
@@ -51,6 +51,8 @@ def _sanitize_url(url):
"""
Do nothing for http or ftp, but make sure nfs is in the expected format
@@ -45,10 +45,10 @@
if url.startswith("nfs://"):
# Convert RFC compliant NFS nfs://server/path/to/distro
# to what mount/anaconda expect nfs:server:/path/to/distro
-Index: virt-manager-1.2.0/virtinst/urlfetcher.py
+Index: virt-manager-1.2.1/virtinst/urlfetcher.py
===================================================================
---- virt-manager-1.2.0.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.2.0/virtinst/urlfetcher.py
+--- virt-manager-1.2.1.orig/virtinst/urlfetcher.py
++++ virt-manager-1.2.1/virtinst/urlfetcher.py
@@ -33,6 +33,7 @@ import urlparse
import urlgrabber.grabber as grabber
@@ -57,7 +57,7 @@
#########################################################################
-@@ -218,7 +219,8 @@ class _MountedImageFetcher(_LocalImageFe
+@@ -219,7 +220,8 @@ class _MountedImageFetcher(_LocalImageFe
logging.debug("Preparing mount at " + self.srcdir)
if self.location.startswith("nfs:"):
++++++ virtinst-pvgrub2-bootloader.patch ++++++
--- /var/tmp/diff_new_pack.WKI7Gb/_old 2015-09-30 05:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.WKI7Gb/_new 2015-09-30 05:51:43.000000000 +0200
@@ -6,14 +6,15 @@
===================================================================
--- 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
++++++ virtinst-s390x-disable-graphics.patch ++++++
--- /var/tmp/diff_new_pack.WKI7Gb/_old 2015-09-30 05:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.WKI7Gb/_new 2015-09-30 05:51:43.000000000 +0200
@@ -16,7 +16,7 @@
self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY
self.__os_object = None
-@@ -619,11 +622,13 @@ class Guest(XMLBuilder):
+@@ -620,11 +623,13 @@ class Guest(XMLBuilder):
self.conn.check_support(
self.conn.SUPPORT_CONN_VIRTIO_CONSOLE)):
dev.target_type = "virtio"
@@ -31,7 +31,7 @@
return
if self.get_devices("video"):
return
-@@ -668,7 +673,7 @@ class Guest(XMLBuilder):
+@@ -669,7 +674,7 @@ class Guest(XMLBuilder):
return
if self.os.is_container():
return
@@ -40,7 +40,7 @@
return
self.add_device(VirtualGraphics(self.conn))
-@@ -996,7 +1001,7 @@ class Guest(XMLBuilder):
+@@ -997,7 +1002,7 @@ class Guest(XMLBuilder):
if self._hv_only_supports_virtio():
return True
++++++ virtinst-set-cache-mode-unsafe-for-install.patch ++++++
--- /var/tmp/diff_new_pack.WKI7Gb/_old 2015-09-30 05:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.WKI7Gb/_new 2015-09-30 05:51:43.000000000 +0200
@@ -27,7 +27,7 @@
self.bootloader = None
if (not install and
self.os.is_xenpv() and
-@@ -371,7 +380,10 @@ class Guest(XMLBuilder):
+@@ -372,7 +381,10 @@ class Guest(XMLBuilder):
self.bootloader = "/usr/bin/pygrub"
self.os.clear()
++++++ virtinst-set-qemu-emulator.patch ++++++
--- /var/tmp/diff_new_pack.WKI7Gb/_old 2015-09-30 05:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.WKI7Gb/_new 2015-09-30 05:51:43.000000000 +0200
@@ -13,7 +13,7 @@
import logging
import urlgrabber.progress as progress
-@@ -806,14 +807,29 @@ class Guest(XMLBuilder):
+@@ -807,14 +808,29 @@ class Guest(XMLBuilder):
self.emulator = None
return
++++++ virtman-show-suse-install-repos.patch ++++++
--- /var/tmp/diff_new_pack.WKI7Gb/_old 2015-09-30 05:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.WKI7Gb/_new 2015-09-30 05:51:43.000000000 +0200
@@ -2,10 +2,10 @@
install.inf and also collects the repos provided by zypper.
These locations are then presented as potential installation
locations when createing a VM.
-Index: virt-manager-1.2.0/virtManager/create.py
+Index: virt-manager-1.2.1/virtManager/create.py
===================================================================
---- virt-manager-1.2.0.orig/virtManager/create.py
-+++ virt-manager-1.2.0/virtManager/create.py
+--- virt-manager-1.2.1.orig/virtManager/create.py
++++ virt-manager-1.2.1/virtManager/create.py
@@ -359,7 +359,13 @@ class vmmCreate(vmmGObjectUI):
self.widget("install-url-options").set_expanded(False)
urlmodel = self.widget("install-url-box").get_model()
@@ -21,10 +21,10 @@
self.populate_media_model(ksmodel, self.config.get_kickstart_urls())
self.set_distro_labels("-", "-", force=True)
-Index: virt-manager-1.2.0/virtinst/util.py
+Index: virt-manager-1.2.1/virtinst/util.py
===================================================================
---- virt-manager-1.2.0.orig/virtinst/util.py
-+++ virt-manager-1.2.0/virtinst/util.py
+--- virt-manager-1.2.1.orig/virtinst/util.py
++++ virt-manager-1.2.1/virtinst/util.py
@@ -23,11 +23,14 @@ import os
import random
import re
@@ -40,7 +40,7 @@
def listify(l):
-@@ -462,3 +465,97 @@ def register_libvirt_error_handler():
+@@ -462,3 +465,96 @@ def register_libvirt_error_handler():
ignore = userdata
ignore = err
libvirt.registerErrorHandler(f=libvirt_callback, ctx=None)
@@ -111,15 +111,14 @@
+ p = subprocess.Popen(cmd, stdout=PIPE, stderr=PIPE)
+ stdout, stderr = p.communicate()
+ zypper_output = stdout
++ zypper_list = zypper_output.split("\n")
++ zypper_header = [x.strip(' ') for x in zypper_list[0].split("|")]
++ uri_index = zypper_header.index("URI")
+ except:
+ if dom0_inst_source is None:
+ dom0_inst_source = []
+ return (0, dom0_inst_source)
+
-+ zypper_list = zypper_output.split("\n")
-+ zypper_header = [x.strip(' ') for x in zypper_list[0].split("|")]
-+ uri_index = zypper_header.index("URI")
-+
+ index_dom0 = -1
+ number_of_sources = 0
+ zypper_output = []
