diff options
| author | Stuart Cardall <developer@it-offshore.co.uk> | 2015-08-17 22:39:22 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2015-09-07 12:09:34 +0000 |
| commit | 6e59c52ee696e5983d5ab36330e01db47ed3de01 (patch) | |
| tree | 524c7e774e471df692c837780bffbe74648fb28e /main/openvswitch/ifupdown.sh | |
| parent | cc8f61f6330f49f1e2522e6fbed88e84e47190c3 (diff) | |
| download | aports-6e59c52ee696e5983d5ab36330e01db47ed3de01.tar.bz2 aports-6e59c52ee696e5983d5ab36330e01db47ed3de01.tar.xz | |
main/openvswitch: fix ifupdown script
starting ovs-vswitchd from the ifupdown script did not start the depends
during boot.
ovs will now start correctly with networking if it is stopped or if none
of the ovs services have been configured.
Diffstat (limited to 'main/openvswitch/ifupdown.sh')
| -rwxr-xr-x | main/openvswitch/ifupdown.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/main/openvswitch/ifupdown.sh b/main/openvswitch/ifupdown.sh index a2bd048ffc..c6f43662fe 100755 --- a/main/openvswitch/ifupdown.sh +++ b/main/openvswitch/ifupdown.sh @@ -29,7 +29,9 @@ if (ovs_vsctl --version) > /dev/null 2>&1; then :; else exit 0 fi -if /etc/init.d/ovs-vswitchd status > /dev/null 2>&1; then :; else +if ! /etc/init.d/ovs-vswitchd status &>/dev/null; then + /etc/init.d/ovs-modules start + /etc/init.d/ovsdb-server start /etc/init.d/ovs-vswitchd start fi @@ -42,8 +44,8 @@ if [ "${MODE}" = "start" ]; then ${OVS_EXTRA+-- $OVS_EXTRA} if [ ! -z "${IF_OVS_PORTS}" ]; then -# ifup --allow="${IFACE}" ${IF_OVS_PORTS} - ifup ${IF_OVS_PORTS} +# ifup --allow="${IFACE}" ${IF_OVS_PORTS} + ifup ${IF_OVS_PORTS} fi ;; OVSPort) @@ -58,7 +60,7 @@ if [ "${MODE}" = "start" ]; then "${IFACE}" ${IF_OVS_OPTIONS} -- set Interface "${IFACE}"\ type=internal ${OVS_EXTRA+-- $OVS_EXTRA} - ip link set dev "${IFACE}" up + ip link set dev "${IFACE}" up ;; OVSBond) ovs_vsctl -- --fake-iface add-bond "${IF_OVS_BRIDGE}"\ @@ -85,7 +87,7 @@ elif [ "${MODE}" = "stop" ]; then case "${IF_OVS_TYPE}" in OVSBridge) if [ ! -z "${IF_OVS_PORTS}" ]; then -# ifdown --allow="${IFACE}" ${IF_OVS_PORTS} +# ifdown --allow="${IFACE}" ${IF_OVS_PORTS} ifdown ${IF_OVS_PORTS} fi |