From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Thu, 15 Feb 2024 16:37:24 +0000 (+0100)
Subject: tests: lxc-test-usernic: use iproute tool instead of brctl
X-Git-Tag: v6.0.0~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=627bb9460c08b272acb4b90d16cb236c10cc2634;p=thirdparty%2Flxc.git

tests: lxc-test-usernic: use iproute tool instead of brctl

This is required to fix autopkgtest failures.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---

diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index 49fd5e3f7..d9cb4bcd1 100755
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -36,8 +36,8 @@ cleanup() {
 		sed -i '/usernic-user/d' /run/lxc/nics /etc/lxc/lxc-usernet
 		ip link set usernic-br0 down
 		ip link set usernic-br1 down
-		brctl delbr usernic-br0
-		brctl delbr usernic-br1
+		ip link del usernic-br0
+		ip link del usernic-br1
 
 		run_cmd "lxc-stop -n b1 -k"
 		pkill -u $(id -u usernic-user) -9
@@ -84,8 +84,8 @@ mkdir -p /run/user/$(id -u usernic-user)
 chown -R usernic-user: /run/user/$(id -u usernic-user) /home/usernic-user
 
 # Create two test bridges
-brctl addbr usernic-br0
-brctl addbr usernic-br1
+ip link add name usernic-br0 type bridge
+ip link add name usernic-br1 type bridge
 ip link set usernic-br0 up
 ip link set usernic-br1 up