From c7763f3f1f0ee35d0983ef65609874f904a24ff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Tue, 27 May 2014 11:16:20 +0000
Subject: [PATCH] Accepting request 235528 from
 home:cbosdonnat:branches:Virtualization

- bnc#870587 - Don't create a default QEMU disk image in the new lxc
  container wizard.
  virtman-lxc-no-default-disk.patch

OBS-URL: https://build.opensuse.org/request/show/235528
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=178
---
 virt-manager.changes              |  7 +++++++
 virt-manager.spec                 |  3 +++
 virtman-lxc-no-default-disk.patch | 28 ++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 virtman-lxc-no-default-disk.patch

diff --git a/virt-manager.changes b/virt-manager.changes
index fedc50f9..2b71d79f 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 27 09:13:49 UTC 2014 - cbosdonnat@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 - cbosdonnat@suse.com
 
diff --git a/virt-manager.spec b/virt-manager.spec
index f0f4c4d6..3b17575e 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -83,6 +83,8 @@ 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
@@ -229,6 +231,7 @@ machine).
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1
+%patch73 -p1
 %patch151 -p1
 %patch152 -p1
 %patch153 -p1
diff --git a/virtman-lxc-no-default-disk.patch b/virtman-lxc-no-default-disk.patch
new file mode 100644
index 00000000..84be8e5e
--- /dev/null
+++ b/virtman-lxc-no-default-disk.patch
@@ -0,0 +1,28 @@
+From a56edc5b454f5ac428e5a9380665001889cb017c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@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
+