[vdsm/f17] update to vdsm-4.10.0-6

[Federico Simoncelli]

commit 9240b569204c69d63dae2384670877cb5ef6726d
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Wed Aug 1 11:38:39 2012 +0200

    update to vdsm-4.10.0-6
    
    - BZ#842948: deployUtil - safely remove bridge
    
    Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>

 ...BZ-842948-deployUtil-safely-remove-bridge.patch |   33 ++++++++++++++++++++
 vdsm.spec                                          |    7 +++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/0041-BZ-842948-deployUtil-safely-remove-bridge.patch b/0041-BZ-842948-deployUtil-safely-remove-bridge.patch
new file mode 100644
index 0000000..8741a36
--- /dev/null
+++ b/0041-BZ-842948-deployUtil-safely-remove-bridge.patch
@@ -0,0 +1,33 @@
+From 15d46e0809e27eb39fde58fb47a0b3914f1d0c90 Mon Sep 17 00:00:00 2001
+From: Douglas Schilling Landgraf <dougsland at redhat.com>
+Date: Tue, 31 Jul 2012 19:36:53 -0400
+Subject: [PATCH 41/41] BZ#842948: deployUtil - safely remove bridge
+
+deployUtil calls /usr/share/vdsm/delNetwork to remove previously created bridge.
+This patch will add ovirtfunctions.ovirt_safe_delete_config() to safely remove
+bridge config files in oVirt Node.
+
+Change-Id: I6e9b00ee4a38ebe7d5011e36bd9d3f7362cf26cd
+Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/6798
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+---
+ vdsm_reg/deployUtil.py.in |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
+index 6bd4b3d..62aef01 100644
+--- a/vdsm_reg/deployUtil.py.in
++++ b/vdsm_reg/deployUtil.py.in
+@@ -904,6 +904,8 @@ def makeBridge(vdcName, vdsmDir):
+                 else:
+                     fReturn = False
+                     logging.debug("makeBridge Failed to del existing bridge. out=" + out + "\nerr=" + str(err) + "\nret=" + str(ret))
++            else:
++                ovirtfunctions.ovirt_safe_delete_config(IFACE_CONFIG + mgtBridge)
+         except:
+             fReturn = False
+             logging.debug("makeBridge Failed to del existing bridge. out=" + out + "\nerr=" + str(err) + "\nret=" + str(ret))
+-- 
+1.7.7.6
+
diff --git a/vdsm.spec b/vdsm.spec
index fcaa97c..652c99e 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -20,7 +20,7 @@
 
 Name:           %{vdsm_name}
 Version:        4.10.0
-Release:        5%{?vdsm_relvtag}%{?dist}%{?extra_release}
+Release:        6%{?vdsm_relvtag}%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -75,6 +75,7 @@ Patch36: 0037-BZ-837054-Do-not-detach-network-from-the-bond-during.patch
 Patch37: 0038-Remove-redundant-explicitBonding-parameter-from-setu.patch
 Patch38: 0039-configNet-clear-up-atomicBackup-arg.patch
 Patch39: 0040-configNet-atomicBackup-remove-new-files-upon-restore.patch
+Patch40: 0041-BZ-842948-deployUtil-safely-remove-bridge.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -408,6 +409,7 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 %patch37 -p1 -b .patch37
 %patch38 -p1 -b .patch38
 %patch39 -p1 -b .patch39
+%patch40 -p1 -b .patch40
 
 %build
 %configure %{?with_hooks:--enable-hooks}
@@ -968,6 +970,9 @@ exit 0
 %{_datadir}/%{vdsm_name}/gluster/hostname.py*
 
 %changelog
+* Wed Aug  1 2012 Federico Simoncelli <fsimonce at redhat.com> 4.10.0-6.fc17
+- BZ#842948: deployUtil - safely remove bridge
+
 * Tue Jul 17 2012 Federico Simoncelli <fsimonce at redhat.com> 4.10.0-5.fc17
 - configNet: atomicBackup: remove new files upon restore
 - configNet: clear up atomicBackup arg