Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2014-05-27 18:33:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-16 18:17:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2014-05-27 18:33:19.000000000 +0200 @@ -1,0 +2,16 @@ +Tue May 27 09:13:49 UTC 2014 - cbosdon...@suse.com + +- bnc#870587 - Don't create a default QEMU disk image in the new lxc + container wizard. + virtman-lxc-no-default-disk.patch + +------------------------------------------------------------------- +Wed May 21 13:43:18 UTC 2014 - cbosdon...@suse.com + +- Improve virt-manager default connections at first start + * virtman-default-lxc-uri.patch: when only libvirt's lxc driver + is available locally, add lxc:/// + * virtman-add-connect-default.patch: when no hypervisor can be + found locally, open the new connection dialog + +------------------------------------------------------------------- New: ---- virtman-add-connect-default.patch virtman-default-lxc-uri.patch virtman-lxc-no-default-disk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.odOydl/_old 2014-05-27 18:33:21.000000000 +0200 +++ /var/tmp/diff_new_pack.odOydl/_new 2014-05-27 18:33:21.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu" @@ -80,6 +81,10 @@ Patch68: virtman-stable-os-support.patch Patch69: virtman-add-s390x-arch-support.patch Patch70: virtman-prevent-double-click-starting-vm-twice.patch +Patch71: virtman-default-lxc-uri.patch +Patch72: virtman-add-connect-default.patch +# PATCH-FIX-UPSTREAM virtman-lxc-no-default-disk.patch -- pending upstream review, bnc#870587 +Patch73: virtman-lxc-no-default-disk.patch Patch151: virtinst-storage-ocfs2.patch Patch152: virtinst-qed.patch Patch153: virtinst-support-suse-distros.patch @@ -224,6 +229,9 @@ %patch68 -p1 %patch69 -p1 %patch70 -p1 +%patch71 -p1 +%patch72 -p1 +%patch73 -p1 %patch151 -p1 %patch152 -p1 %patch153 -p1 @@ -232,7 +240,7 @@ %patch156 -p1 %patch157 -p1 %patch158 -p1 -%patch159 -p1 +###%patch159 -p1 nocow flag %patch160 -p1 %patch161 -p1 ++++++ virtman-add-connect-default.patch ++++++ Index: virt-manager-1.0.1/virtManager/engine.py =================================================================== --- virt-manager-1.0.1.orig/virtManager/engine.py +++ virt-manager-1.0.1/virtManager/engine.py @@ -205,9 +205,6 @@ class vmmEngine(vmmGObject): except: logging.exception("Error talking to PackageKit") - if tryuri is None: - tryuri = "qemu:///system" - warnmsg = _("The 'libvirtd' service will need to be started.\n\n" "After that, virt-manager will connect to libvirt on\n" "the next application start up.") @@ -221,7 +218,11 @@ class vmmEngine(vmmGObject): if not connected and do_start: manager.err.ok(_("Libvirt service must be started"), warnmsg) - self.idle_add(idle_connect) + # If there is no default URI to be found, show the new connection dialog + if tryuri is None: + self._do_show_connect(self.windowManager) + else: + self.idle_add(idle_connect) def load_stored_uris(self): ++++++ virtman-default-lxc-uri.patch ++++++ >From 02c2d2fcb3c445082a91807ab277a7c85d0a38db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdon...@free.fr> Date: Tue, 20 May 2014 17:14:27 +0200 Subject: [PATCH] Default connection URI if libvirt-daemon-driver-lxc is installed The default URI is set to lxc:/// if libvirt's lxc driver is installed locally, but only if there is no kvm/xen URI to default to. --- virtManager/connect.py | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/virtManager/connect.py b/virtManager/connect.py index 1247d75..34835fa 100644 --- a/virtManager/connect.py +++ b/virtManager/connect.py @@ -116,6 +116,10 @@ class vmmConnect(vmmGObjectUI): return "qemu:///system" else: return "qemu:///session" + + if (os.path.exists("/usr/lib/libvirt/libvirt_lxc") or + os.path.exists("/usr/lib64/libvirt/libvirt_lxc")): + return "lxc:///" return None def cancel(self, ignore1=None, ignore2=None): -- 1.8.4.5 ++++++ virtman-lxc-no-default-disk.patch ++++++ >From a56edc5b454f5ac428e5a9380665001889cb017c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdon...@suse.com> Date: Tue, 27 May 2014 10:52:35 +0200 Subject: [PATCH] Don't create a qemu disk image when creating containers Make sure we don't create a default disk image if the option is checked but not visible as this is the case for containers --- virtManager/addstorage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/virtManager/addstorage.py b/virtManager/addstorage.py index b481fcb..654b620 100644 --- a/virtManager/addstorage.py +++ b/virtManager/addstorage.py @@ -256,7 +256,8 @@ class vmmAddStorage(vmmGObjectUI): return path def is_default_storage(self): - return self.widget("config-storage-create").get_active() + return self.widget("config-storage-create").is_visible() and \ + self.widget("config-storage-create").get_active() def _check_ideal_path(self, path, vmname, collidelist): # See if the ideal disk path (/default/pool/vmname.img) -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
