mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-12-28 21:02:25 +01:00
6e59c52ee6
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.
65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
--- 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
|
|
@@ -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}
|
|
fi
|
|
;;
|
|
OVSPort)
|
|
@@ -50,24 +53,24 @@ if [ "${MODE}" = "start" ]; then
|
|
"${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)
|
|
@@ -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 ${IF_OVS_PORTS}
|
|
fi
|
|
|
|
ovs_vsctl -- --if-exists del-br "${IFACE}"
|