--- ./debian/ifupdown.sh.orig +++ ./debian/ifupdown.sh @@ -29,8 +29,8 @@ if (ovs_vsctl --version) > /dev/null 2>& exit 0 fi -if /etc/init.d/openvswitch-switch status > /dev/null 2>&1; then :; else - /etc/init.d/openvswitch-switch start +if ! /etc/init.d/ovs-vswitchd status &>/dev/null; then + /etc/init.d/ovs-vswitchd start fi if [ "${MODE}" = "start" ]; then @@ -38,7 +38,8 @@ ${OVS_EXTRA+-- $OVS_EXTRA} if [ ! -z "${IF_OVS_PORTS}" ]; then - ifup --allow="${IFACE}" ${IF_OVS_PORTS} +# ifup --allow="${IFACE}" ${IF_OVS_PORTS} + ifup ${IF_OVS_PORTS} fi ;; OVSPort) @@ -46,24 +47,24 @@ "${IFACE}" ${IF_OVS_OPTIONS} \ ${OVS_EXTRA+-- $OVS_EXTRA} - ifconfig "${IFACE}" up + ip link set dev "${IFACE}" up ;; OVSIntPort) ovs_vsctl -- --may-exist add-port "${IF_OVS_BRIDGE}"\ "${IFACE}" ${IF_OVS_OPTIONS} -- set Interface "${IFACE}"\ type=internal ${OVS_EXTRA+-- $OVS_EXTRA} - ifconfig "${IFACE}" up + ip link set dev "${IFACE}" up ;; OVSBond) ovs_vsctl -- --fake-iface add-bond "${IF_OVS_BRIDGE}"\ "${IFACE}" ${IF_OVS_BONDS} ${IF_OVS_OPTIONS} \ ${OVS_EXTRA+-- $OVS_EXTRA} - ifconfig "${IFACE}" up + ip link set dev "${IFACE}" up for slave in ${IF_OVS_BONDS} do - ifconfig "${slave}" up + ip link set dev "${slave}" up done ;; OVSTunnel) @@ -80,7 +81,8 @@ 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 ovs_vsctl -- --if-exists del-br "${IFACE}"