- bnc#885094 - sles 12 beta 9 virt manager install of sles 12 pv

guest over nfs fails to reboot
  virtman-dont-allow-grub.xen-to-be-deleted.patch
- bnc#885273 - create virtual network wizard accept empty name
  virtman-check-for-empty-network-name.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=185

virt-manager.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jul  1 09:55:29 MDT 2014 - carnold@suse.com
+
+- bnc#885094 - sles 12 beta 9 virt manager install of sles 12 pv
+  guest over nfs fails to reboot
+  virtman-dont-allow-grub.xen-to-be-deleted.patch
+- bnc#885273 - create virtual network wizard accept empty name
+  virtman-check-for-empty-network-name.patch
+
 -------------------------------------------------------------------
 Fri Jun 27 10:23:09 MDT 2014 - carnold@suse.com
 

virt-manager.spec

@@ -99,6 +99,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
+Patch73:        virtman-dont-allow-grub.xen-to-be-deleted.patch
+Patch74:        virtman-check-for-empty-network-name.patch
 Patch151:       virtinst-storage-ocfs2.patch
 Patch152:       virtinst-qed.patch
 Patch153:       virtinst-support-suse-distros.patch
@@ -262,6 +264,8 @@ machine).
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1
+%patch73 -p1
+%patch74 -p1
 %patch151 -p1
 %patch152 -p1
 %patch153 -p1

virtman-check-for-empty-network-name.patch

@@ -0,0 +1,15 @@
+bnc#885273
+
+Index: virt-manager-1.0.1/virtManager/createnet.py
+===================================================================
+--- virt-manager-1.0.1.orig/virtManager/createnet.py
++++ virt-manager-1.0.1/virtManager/createnet.py
+@@ -251,6 +251,8 @@ class vmmCreateNetwork(vmmGObjectUI):
+         try:
+             net = self._build_xmlstub()
+             net.name = self.widget("net-name").get_text()
++            if net.name == '':
++                return self.err.val_err(_("Invalid network name"), "")
+         except Exception, e:
+             return self.err.val_err(_("Invalid network name"), str(e))
+ 

virtman-dont-allow-grub.xen-to-be-deleted.patch

@@ -0,0 +1,15 @@
+bnc#885094
+
+Index: virt-manager-1.0.1/virtManager/delete.py
+===================================================================
+--- virt-manager-1.0.1.orig/virtManager/delete.py
++++ virt-manager-1.0.1/virtManager/delete.py
+@@ -242,7 +242,7 @@ def populate_storage_list(storage_list,
+     diskdata.append(("dtb", vm.get_xmlobj().os.dtb, True, False))
+ 
+     for target, path, ro, shared in diskdata:
+-        if not path:
++        if not path or path == "/usr/lib/grub2/x86_64-xen/grub.xen":
+             continue
+ 
+         # There are a few pieces here