Commit b2a0daa5bd (debian: Don't recreate bridges during manual restart.)
added a check on $RUNLEVEL to only create bridges and ports when the
system starts up. This fix does not work with systemd.
This commit uses a different approach to solve the same problem.
Reported-by: Philipp S. Schmidt <ph...@in-panik.de>
Signed-off-by: Gurucharan Shetty <gshe...@nicira.com>
---
debian/openvswitch-switch.init | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index 481b29c..bf84477 100755
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -31,7 +31,6 @@
test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch
network_interfaces () {
- [ -z "${RUNLEVEL}" ] && return
INTERFACES="/etc/network/interfaces"
[ -e "${INTERFACES}" ] || return
bridges=`awk '{ if ($1 == "allow-ovs") { print $2; } }' "${INTERFACES}"`
@@ -67,11 +66,13 @@ start () {
fi
set "$@" $OVS_CTL_OPTS
"$@" || exit $?
- [ "$2" = "start" ] && network_interfaces ifup
+ if [ "$2" = "start" ] && [ "$READ_INTERFACES" != "no" ]; then
+ network_interfaces ifup
+ fi
}
stop () {
- network_interfaces ifdown
+ [ "$READ_INTERFACES" != "no" ] && network_interfaces ifdown
ovs_ctl stop
}
@@ -106,8 +107,8 @@ restart () {
start restart
fi
else
- stop
- start
+ READ_INTERFACES="no" stop
+ READ_INTERFACES="no" start
fi
}
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
