From 818bca028c8d3c4cf3e174c11032079d264bc1d0 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Fri, 25 Jan 2013 15:06:57 +0100 Subject: [PATCH] rhel: Automatically start openvswitch service before bringing an ovs interface up or down This patch modifies the ifup/ifdown scripts to automatically start the openvswitch service before ovs-vsctl is invoked thus not making it mandatory to auto-start openvswitch on boot. Signed-off-by: Thomas Graf Signed-off-by: Ben Pfaff --- AUTHORS | 1 + rhel/etc_sysconfig_network-scripts_ifdown-ovs | 2 ++ rhel/etc_sysconfig_network-scripts_ifup-ovs | 2 ++ 3 files changed, 5 insertions(+) diff --git a/AUTHORS b/AUTHORS index fa5efed4f..165fd5a8d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -65,6 +65,7 @@ Simon Horman horms@verge.net.au Tadaaki Nagao nagao@stratosphere.co.jp Tetsuo NAKAGAWA nakagawa@mxc.nes.nec.co.jp Thomas Goirand zigo@debian.org +Thomas Graf tgraf@redhat.com Thomas Lacroix thomas.lacroix@citrix.com Todd Deshane deshantm@gmail.com Tom Everman teverman@google.com diff --git a/rhel/etc_sysconfig_network-scripts_ifdown-ovs b/rhel/etc_sysconfig_network-scripts_ifdown-ovs index 19047d8ba..d2a2f4bb9 100755 --- a/rhel/etc_sysconfig_network-scripts_ifdown-ovs +++ b/rhel/etc_sysconfig_network-scripts_ifdown-ovs @@ -34,6 +34,8 @@ if [ ! -x ${OTHERSCRIPT} ]; then OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-eth" fi +[ -f /var/lock/subsys/openvswitch ] || /sbin/service openvswitch start + case "$TYPE" in OVSBridge) ${OTHERSCRIPT} ${CONFIG} $2 diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs b/rhel/etc_sysconfig_network-scripts_ifup-ovs index c42787903..61b0af9d5 100755 --- a/rhel/etc_sysconfig_network-scripts_ifup-ovs +++ b/rhel/etc_sysconfig_network-scripts_ifup-ovs @@ -34,6 +34,8 @@ if [ ! -x ${OTHERSCRIPT} ]; then OTHERSCRIPT="/etc/sysconfig/network-scripts/ifup-eth" fi +[ -f /var/lock/subsys/openvswitch ] || /sbin/service openvswitch start + case "$TYPE" in OVSBridge) ovs-vsctl -t ${TIMEOUT} -- --may-exist add-br "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA} -- 2.20.1