[openvswitch/f16] Update to 1.4.2
Tomas Hozza
thozza at fedoraproject.org
Fri Aug 17 14:07:42 UTC 2012
commit 54df2a28ede6f3bdd64bbc3e5ebf47f9b77d3aba
Author: Tomas Hozza <thozza at redhat.com>
Date: Fri Aug 17 16:03:21 2012 +0200
Update to 1.4.2
- Fixed openvswitch-rhel-initscripts-resync.patch so it fits on new sources.
.gitignore | 1 +
openvswitch-rhel-initscripts-resync.patch | 224 +++++-----------------------
openvswitch.spec | 8 +-
sources | 2 +-
4 files changed, 48 insertions(+), 187 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e6b7380..7d0260c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/openvswitch-1.4.0.tar.gz
+/openvswitch-1.4.2.tar.gz
diff --git a/openvswitch-rhel-initscripts-resync.patch b/openvswitch-rhel-initscripts-resync.patch
index 2e0cce2..6907a5a 100644
--- a/openvswitch-rhel-initscripts-resync.patch
+++ b/openvswitch-rhel-initscripts-resync.patch
@@ -1,89 +1,14 @@
-From 26fbdf773f546f653d67f1bf022ff9021cefc062 Mon Sep 17 00:00:00 2001
-From: Gurucharan Shetty <gshetty at nicira.com>
-Date: Fri, 20 Jan 2012 15:07:50 -0800
-Subject: [PATCH] rhel: Correct an example in README.RHEL
-
-Change the value of OVS_BRIDGE in an example to point
-to the correct bridge name.
-
-Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
----
- rhel/README.RHEL | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/rhel/README.RHEL b/rhel/README.RHEL
-index e6617ab..3e682b3 100644
---- a/rhel/README.RHEL
-+++ b/rhel/README.RHEL
-@@ -70,7 +70,7 @@ DEVICE=eth0
- ONBOOT=yes
- DEVICETYPE=ovs
- TYPE=OVSPort
--OVS_BRIDGE=internet
-+OVS_BRIDGE=ovsbridge0
- BOOTPROTO=none
- HOTPLUG=no
-
---
-1.7.7.6
-
-From 5442edb9e0afb6fdc4cd81e5d1ebd3e0d4e6accf Mon Sep 17 00:00:00 2001
-From: Gurucharan Shetty <gshetty at nicira.com>
-Date: Mon, 30 Jan 2012 20:17:53 -0800
-Subject: [PATCH] rhel: Enable DHCP in redhat network scripts.
-
-The current network-script, ifup-ovs does not work well if you
-enable DHCP on the OVS. It will work if we name the bridge
-alphabetically greater than the underlying physical interfaces.
-Even then, it will do multiple DHCP attempts slowing down the boot
-up process.
-
-This patch allows DHCP on an OVS bridge.
-
-Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
----
- rhel/README.RHEL | 12 ++++++++++++
- rhel/etc_sysconfig_network-scripts_ifup-ovs | 16 +++++++++++++++-
- 2 files changed, 27 insertions(+), 1 deletions(-)
-
-diff --git a/rhel/README.RHEL b/rhel/README.RHEL
-index 3e682b3..b97fb6c 100644
---- a/rhel/README.RHEL
-+++ b/rhel/README.RHEL
-@@ -62,6 +62,18 @@ IPADDR=A.B.C.D
- NETMASK=X.Y.Z.0
- HOTPLUG=no
-
-+Enable DHCP on the bridge:
-+* Needs OVSBOOTPROTO instead of BOOTPROTO.
-+* All the interfaces that can reach the DHCP server
-+as a comma separated list in OVSDHCPINTERFACES.
-+
-+DEVICE=ovsbridge0
-+ONBOOT=yes
-+DEVICETYPE=ovs
-+TYPE=OVSBridge
-+OVSBOOTPROTO="dhcp"
-+OVSDHCPINTERFACES="eth0"
-+HOTPLUG=no
-
- Adding physical eth0 to ovsbridge0 described above:
-
-diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs b/rhel/etc_sysconfig_network-scripts_ifup-ovs
-index 7074c07..18cebc4 100755
---- a/rhel/etc_sysconfig_network-scripts_ifup-ovs
-+++ b/rhel/etc_sysconfig_network-scripts_ifup-ovs
-@@ -36,12 +36,25 @@ fi
+diff -up openvswitch-1.4.2/rhel/etc_sysconfig_network-scripts_ifup-ovs.initscripts openvswitch-1.4.2/rhel/etc_sysconfig_network-scripts_ifup-ovs
+--- openvswitch-1.4.2/rhel/etc_sysconfig_network-scripts_ifup-ovs.initscripts 2012-06-01 23:06:32.000000000 +0200
++++ openvswitch-1.4.2/rhel/etc_sysconfig_network-scripts_ifup-ovs 2012-08-17 15:38:03.541423503 +0200
+@@ -37,12 +37,22 @@ fi
case "$TYPE" in
OVSBridge)
- ovs-vsctl -- --may-exist add-br "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
+ ovs-vsctl -t ${TIMEOUT} -- --may-exist add-br "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
- ${OTHERSCRIPT} ${CONFIG} ${2}
+ if [ "${OVSBOOTPROTO}" = "dhcp" ] && [ -n "${OVSINTF}" ]; then
-+ case ${OVSDHCPINTERFACES} in
-+ ${OVSINTF#ifcfg-} | \
-+ "${OVSINTF#ifcfg-},"* | \
-+ *",${OVSINTF#ifcfg-}" | \
-+ *",${OVSINTF#ifcfg-},"*)
++ case " ${OVSDHCPINTERFACES} " in
++ *" ${OVSINTF} "*)
+ BOOTPROTO=dhcp ${OTHERSCRIPT} ${CONFIG}
+ ;;
+ esac
@@ -95,116 +20,47 @@ index 7074c07..18cebc4 100755
OVSPort)
/sbin/ifup "$OVS_BRIDGE"
${OTHERSCRIPT} ${CONFIG} ${2}
- ovs-vsctl -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
-+ OVSINTF=${CONFIG} /sbin/ifup "$OVS_BRIDGE"
+ ovs-vsctl -t ${TIMEOUT} -- --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 +68,7 @@ case "$TYPE" in
+@@ -56,6 +66,7 @@ case "$TYPE" in
done
- ovs-vsctl -- --fake-iface add-bond "$OVS_BRIDGE" "$DEVICE" ${BOND_IFACES} $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
+ ovs-vsctl -t ${TIMEOUT} -- --fake-iface add-bond "$OVS_BRIDGE" "$DEVICE" ${BOND_IFACES} $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
${OTHERSCRIPT} ${CONFIG} ${2}
-+ OVSINTF=${CONFIG} /sbin/ifup "$OVS_BRIDGE"
++ OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
;;
*)
echo $"Invalid OVS interface type $TYPE"
---
-1.7.7.6
-
-From e31f6c5d1c26e9b86adb6449226b4f08f2c8d7a5 Mon Sep 17 00:00:00 2001
-From: Ben Pfaff <blp at nicira.com>
-Date: Fri, 3 Feb 2012 09:33:47 -0800
-Subject: [PATCH] rhel: Simplify ifup-ovs script use of "case".
-
-Suggested-by: "Alexey I. Froloff" <raorn at altlinux.org>
-Signed-off-by: Ben Pfaff <blp at nicira.com>
----
- rhel/etc_sysconfig_network-scripts_ifup-ovs | 7 ++-----
- 1 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs b/rhel/etc_sysconfig_network-scripts_ifup-ovs
-index 18cebc4..4773ee4 100755
---- a/rhel/etc_sysconfig_network-scripts_ifup-ovs
-+++ b/rhel/etc_sysconfig_network-scripts_ifup-ovs
-@@ -37,11 +37,8 @@ case "$TYPE" in
- OVSBridge)
- ovs-vsctl -- --may-exist add-br "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
- if [ "${OVSBOOTPROTO}" = "dhcp" ] && [ -n "${OVSINTF}" ]; then
-- case ${OVSDHCPINTERFACES} in
-- ${OVSINTF#ifcfg-} | \
-- "${OVSINTF#ifcfg-},"* | \
-- *",${OVSINTF#ifcfg-}" | \
-- *",${OVSINTF#ifcfg-},"*)
-+ case ,${OVSDHCPINTERFACES}, in
-+ *,${OVSINTF#ifcfg-},*)
- BOOTPROTO=dhcp ${OTHERSCRIPT} ${CONFIG}
- ;;
- esac
---
-1.7.7.6
-
-From b4b6a39ae688b88b2d17c0b47b105fed86f6c29d Mon Sep 17 00:00:00 2001
-From: Gurucharan Shetty <gshetty at nicira.com>
-Date: Fri, 3 Feb 2012 12:21:30 -0800
-Subject: [PATCH] rhel: Space separated list of DHCP interfaces in network
- scripts.
-
-Use space separated list of DHCP interfaces for OVSDHCPINTERFACES
-instead of comma separated list. This is done to maintain
-consistency with BOND_IFACES.
-
-Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
----
- rhel/README.RHEL | 2 +-
- rhel/etc_sysconfig_network-scripts_ifup-ovs | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/rhel/README.RHEL b/rhel/README.RHEL
-index b97fb6c..d9b68e4 100644
---- a/rhel/README.RHEL
-+++ b/rhel/README.RHEL
-@@ -65,7 +65,7 @@ HOTPLUG=no
- Enable DHCP on the bridge:
- * Needs OVSBOOTPROTO instead of BOOTPROTO.
- * All the interfaces that can reach the DHCP server
--as a comma separated list in OVSDHCPINTERFACES.
+diff -up openvswitch-1.4.2/rhel/README.RHEL.initscripts openvswitch-1.4.2/rhel/README.RHEL
+--- openvswitch-1.4.2/rhel/README.RHEL.initscripts 2012-06-01 23:06:32.000000000 +0200
++++ openvswitch-1.4.2/rhel/README.RHEL 2012-08-17 15:22:14.684169994 +0200
+@@ -62,6 +62,18 @@ IPADDR=A.B.C.D
+ NETMASK=X.Y.Z.0
+ HOTPLUG=no
+
++Enable DHCP on the bridge:
++* Needs OVSBOOTPROTO instead of BOOTPROTO.
++* All the interfaces that can reach the DHCP server
+as a space separated list in OVSDHCPINTERFACES.
++
++DEVICE=ovsbridge0
++ONBOOT=yes
++DEVICETYPE=ovs
++TYPE=OVSBridge
++OVSBOOTPROTO="dhcp"
++OVSDHCPINTERFACES="eth0"
++HOTPLUG=no
- DEVICE=ovsbridge0
+ Adding physical eth0 to ovsbridge0 described above:
+
+@@ -70,7 +82,7 @@ DEVICE=eth0
ONBOOT=yes
-diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs b/rhel/etc_sysconfig_network-scripts_ifup-ovs
-index 4773ee4..b800ce0 100755
---- a/rhel/etc_sysconfig_network-scripts_ifup-ovs
-+++ b/rhel/etc_sysconfig_network-scripts_ifup-ovs
-@@ -37,8 +37,8 @@ case "$TYPE" in
- OVSBridge)
- ovs-vsctl -- --may-exist add-br "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
- if [ "${OVSBOOTPROTO}" = "dhcp" ] && [ -n "${OVSINTF}" ]; then
-- case ,${OVSDHCPINTERFACES}, in
-- *,${OVSINTF#ifcfg-},*)
-+ case " ${OVSDHCPINTERFACES} " in
-+ *" ${OVSINTF} "*)
- BOOTPROTO=dhcp ${OTHERSCRIPT} ${CONFIG}
- ;;
- esac
-@@ -51,7 +51,7 @@ case "$TYPE" in
- /sbin/ifup "$OVS_BRIDGE"
- ${OTHERSCRIPT} ${CONFIG} ${2}
- ovs-vsctl -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
-- OVSINTF=${CONFIG} /sbin/ifup "$OVS_BRIDGE"
-+ OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
- ;;
- OVSIntPort)
- /sbin/ifup "$OVS_BRIDGE"
-@@ -65,7 +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=${CONFIG} /sbin/ifup "$OVS_BRIDGE"
-+ OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
- ;;
- *)
- echo $"Invalid OVS interface type $TYPE"
---
-1.7.7.6
-
+ DEVICETYPE=ovs
+ TYPE=OVSPort
+-OVS_BRIDGE=internet
++OVS_BRIDGE=ovsbridge0
+ BOOTPROTO=none
+ HOTPLUG=no
+
diff --git a/openvswitch.spec b/openvswitch.spec
index 169ec2c..8b47741 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -1,6 +1,6 @@
Name: openvswitch
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
Summary: Open vSwitch daemon/database/utilities
# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the
@@ -206,6 +206,10 @@ fi
%changelog
+* Fri Aug 17 2012 Tomas Hozza <thozza at redhat.com> - 1.4.2-1
+- Update to 1.4.2
+- Fixed openvswitch-rhel-initscripts-resync.patch so it fits on new sources.
+
* Thu Mar 15 2012 Chris Wright <chrisw at redhat.com> - 1.4.0-5
- fix ovs network initscripts DHCP address acquisition (#803843)
diff --git a/sources b/sources
index 791754a..83efe04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3847c60af329bfe81ff7220b9f489fa5 openvswitch-1.4.0.tar.gz
+c08760c2d29e244a208a418615e01b0b openvswitch-1.4.2.tar.gz
More information about the scm-commits
mailing list