From afd63709f78c61fa0f7a6e29a3c073b6c1d043c1 Mon Sep 17 00:00:00 2001
From: Jonathan Dupart <jonathan@dupart.org>
Date: Sat, 30 Mar 2019 18:19:12 +0100
Subject: [PATCH 1/2] Use ip instead of ifconfig in ifupdown.sh (Closes:
 #918320).

This is a partial revert of 650fce2f45aac5a46e1cec6ea48dffce0b095c23.

Thanks: Jose Luis Tallon
---
 debian/ifupdown.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/ifupdown.sh b/debian/ifupdown.sh
index f7b534e2e..bbd931e74 100755
--- a/debian/ifupdown.sh
+++ b/debian/ifupdown.sh
@@ -57,24 +57,24 @@ if [ "${MODE}" = "start" ]; then
                     "${IFACE}" ${IF_OVS_OPTIONS} \
                     ${OVS_EXTRA+-- $OVS_EXTRA}
 
-                ifconfig "${IFACE}" up
+                ip link set "${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 "${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 "${IFACE}" up
                 for slave in ${IF_OVS_BONDS}
                 do
-                    ifconfig "${slave}" up
+                    ip link set "${IFACE}" up
                 done
                 ;;
         OVSPatchPort)
-- 
GitLab


From ea9fb6d481dcd20cc2a42ef24ab956e9e4577bae Mon Sep 17 00:00:00 2001
From: Jonathan Dupart <jonathan@dupart.org>
Date: Sat, 30 Mar 2019 18:33:27 +0100
Subject: [PATCH 2/2] Remove network.target from "After" dependencies of
 openvswitch-switch.service (Closes: #924562)

networking.service specifies Before=network.target. So
openvswitch-switch.service should run before (via networking.service)
and after network.target, which is an unsolvable loop dependency.

Thanks: Benjamin Drung
---
 debian/openvswitch-switch.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/openvswitch-switch.service b/debian/openvswitch-switch.service
index a43706a32..ff2acbe04 100644
--- a/debian/openvswitch-switch.service
+++ b/debian/openvswitch-switch.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Open vSwitch
-After=network.target openvswitch-nonetwork.service
+After=openvswitch-nonetwork.service
 Requires=openvswitch-nonetwork.service
 Before=networking.service
 
-- 
GitLab