[openvswitch] fix ovs network initscripts DHCP address acquisition (#803843)

[Chris Wright]

commit 87a74a57ca82c285b325f162378fd73605f8c811
Author: Chris Wright <chrisw at sous-sol.org>
Date:   Thu Mar 15 12:15:30 2012 -0700

    fix ovs network initscripts DHCP address acquisition (#803843)

 ifup-ovs         |   13 ++++++++++++-
 openvswitch.spec |    7 ++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/ifup-ovs b/ifup-ovs
index 7074c07..b800ce0 100644
--- a/ifup-ovs
+++ b/ifup-ovs
@@ -36,12 +36,22 @@ fi
 case "$TYPE" in
 	OVSBridge)
 		ovs-vsctl -- --may-exist add-br "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
-		${OTHERSCRIPT} ${CONFIG} ${2}
+		if [ "${OVSBOOTPROTO}" = "dhcp" ] && [ -n "${OVSINTF}" ]; then
+			case " ${OVSDHCPINTERFACES} " in
+				*" ${OVSINTF} "*)
+					BOOTPROTO=dhcp ${OTHERSCRIPT} ${CONFIG}
+				;;
+			esac
+		fi
+		if [ "${OVSBOOTPROTO}" != "dhcp" ] && [ -z "${OVSINTF}" ]; then
+			${OTHERSCRIPT} ${CONFIG}
+		fi
 		;;
 	OVSPort)
 		/sbin/ifup "$OVS_BRIDGE"
 		${OTHERSCRIPT} ${CONFIG} ${2}
 		ovs-vsctl -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
+		OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
 		;;
 	OVSIntPort)
 		/sbin/ifup "$OVS_BRIDGE"
@@ -55,6 +65,7 @@ case "$TYPE" in
 		done
 		ovs-vsctl -- --fake-iface add-bond "$OVS_BRIDGE" "$DEVICE" ${BOND_IFACES} $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
 		${OTHERSCRIPT} ${CONFIG} ${2}
+		OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
 		;;
 	*)
 		echo $"Invalid OVS interface type $TYPE"
diff --git a/openvswitch.spec b/openvswitch.spec
index bdc899f..169ec2c 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -1,6 +1,6 @@
 Name:           openvswitch
 Version:        1.4.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Open vSwitch daemon/database/utilities
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
@@ -23,6 +23,7 @@ Source8:        ovsdbmonitor-move-to-its-own-data-directory.patch
 Patch0:         openvswitch-configure-ovskmod-var-autoconfd.patch
 # mv ovsdbmonitordir. Source8 (accepted upstream) is source for patch1
 Patch1:         ovsdbmonitor-move-to-its-own-data-directory-automaked.patch
+Patch2:         openvswitch-rhel-initscripts-resync.patch
 
 BuildRequires:  systemd-units openssl openssl-devel
 BuildRequires:  python python-twisted-core python-twisted-conch python-zope-interface PyQt4
@@ -77,6 +78,7 @@ issues in Open vSwitch setup.
 %setup -q
 %patch0 -p1 -b .ovskmod
 %patch1 -p1 -b .ovsdbmonitordir
+%patch2 -p1 -b .initscripts
 
 
 %build
@@ -204,6 +206,9 @@ fi
 
 
 %changelog
+* Thu Mar 15 2012 Chris Wright <chrisw at redhat.com> - 1.4.0-5
+- fix ovs network initscripts DHCP address acquisition (#803843)
+
 * Tue Mar  6 2012 Chris Wright <chrisw at redhat.com> - 1.4.0-4
 - make BuildRequires openssl explicit (needed on f18/rawhide now)