From 0053d6e2b3bc4f99dfe3a63d4d8a3c5708592e06 Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Sun, 12 Jul 2020 19:42:33 +0200
Subject: [PATCH] Replace brctl command with ip bridge equivalent

---
 templates/etc/openvpn/server/vpn-up-down.sh.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/etc/openvpn/server/vpn-up-down.sh.j2 b/templates/etc/openvpn/server/vpn-up-down.sh.j2
index 422c9f8..cd0e9d2 100644
--- a/templates/etc/openvpn/server/vpn-up-down.sh.j2
+++ b/templates/etc/openvpn/server/vpn-up-down.sh.j2
@@ -5,13 +5,13 @@ if [ $(echo "$0" | grep -c up) -eq 1 ]; then
 	done
 	/usr/sbin/ip link set up $1
 {% if openvpn_bridge_type == "bridge" %}
-	/usr/sbin/brctl addif {{ openvpn_bridge }} $1
+	/usr/sbin/ip link set dev $1 master {{ openvpn_bridge }}
 {% elif openvpn_bridge_type == "ovs" %}
 	/usr/bin/ovs-vsctl add-port {{ openvpn_bridge }} $1 tag={{ openvpn_vlan }} vlan_mode=native-tagged
 {% endif %}
 elif [ $(echo "$0" | grep -c down) -eq 1 ]; then
 {% if openvpn_bridge_type == "bridge" %}
-	/usr/sbin/brctl delif {{ openvpn_bridge }} $1
+	/usr/sbin/ip link set dev $1 nomaster
 {% elif openvpn_bridge_type == "ovs" %}
 	/usr/bin/ovs-vsctl del-port {{ openvpn_bridge }} $1
 {% endif %}