From: Ethan Jackson <ethan@nicira.com>
Date: Wed, 31 Aug 2011 18:23:21 +0000 (-0700)
Subject: rhel: Don't delete bridges on boot.
X-Git-Tag: v1.3.0~366
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a281173e19918379832ec535b18aa2af58832efb;hp=24b019f808211a95078efd916064af0975ca5733;p=sliver-openvswitch.git

rhel: Don't delete bridges on boot.

Before this patch, the RHEL init scripts would remove all bridges
configured on the system at boot.
---

diff --git a/rhel/etc_init.d_openvswitch b/rhel/etc_init.d_openvswitch
index c7543cc55..6f7fe6955 100755
--- a/rhel/etc_init.d_openvswitch
+++ b/rhel/etc_init.d_openvswitch
@@ -48,10 +48,6 @@ start () {
     if test X"$VSWITCHD_MLOCKALL" != X; then
 	set "$@" --mlockall="$VSWITCHD_MLOCKALL"
     fi
-    if test ! -e /var/run/openvswitch.booted; then
-        touch /var/run/openvswitch.booted
-        set "$@" --delete-bridges
-    fi
     "$@"
 
     touch /var/lock/subsys/openvswitch