diff options
Diffstat (limited to 'main/openvswitch/ifupdown-alpine.patch')
| -rw-r--r-- | main/openvswitch/ifupdown-alpine.patch | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/main/openvswitch/ifupdown-alpine.patch b/main/openvswitch/ifupdown-alpine.patch index a417f72cef..d9c0d89e9a 100644 --- a/main/openvswitch/ifupdown-alpine.patch +++ b/main/openvswitch/ifupdown-alpine.patch @@ -1,27 +1,29 @@ ---- ./debian/ifupdown.sh.orig -+++ ./debian/ifupdown.sh -@@ -29,8 +29,8 @@ if (ovs_vsctl --version) > /dev/null 2>& +--- openvswitch-2.3.2/debian/ifupdown.sh 2015-06-18 19:32:47.000000000 +0000 ++++ openvswitch-2.3.2/debian/ifupdown.sh.new 2015-08-17 15:56:59.703461309 +0000 +@@ -29,8 +29,10 @@ 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-modules start ++ /etc/init.d/ovsdb-server start + /etc/init.d/ovs-vswitchd start fi if [ "${MODE}" = "start" ]; then -@@ -38,7 +38,8 @@ +@@ -42,7 +44,8 @@ if [ "${MODE}" = "start" ]; then ${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} ++# ifup --allow="${IFACE}" ${IF_OVS_PORTS} ++ ifup ${IF_OVS_PORTS} fi ;; OVSPort) -@@ -46,24 +47,24 @@ +@@ -50,24 +53,24 @@ if [ "${MODE}" = "start" ]; then "${IFACE}" ${IF_OVS_OPTIONS} \ ${OVS_EXTRA+-- $OVS_EXTRA} @@ -34,7 +36,7 @@ type=internal ${OVS_EXTRA+-- $OVS_EXTRA} - ifconfig "${IFACE}" up -+ ip link set dev "${IFACE}" up ++ ip link set dev "${IFACE}" up ;; OVSBond) ovs_vsctl -- --fake-iface add-bond "${IF_OVS_BRIDGE}"\ @@ -50,12 +52,12 @@ done ;; OVSTunnel) -@@ -80,7 +81,8 @@ +@@ -84,7 +87,8 @@ 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 --allow="${IFACE}" ${IF_OVS_PORTS} + ifdown ${IF_OVS_PORTS} fi |