[gentoo-commits] proj/netifrc:master commit in: net/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/netifrc:master commit in: net/
Date: Thu, 11 Mar 2021 16:54:21 +0000 (UTC)	[thread overview]
Message-ID: <1615481613.b581c3f76b95bd2173a13d08054120f284ac06e7.polynomial-c@OpenRC> (raw)

commit:     b581c3f76b95bd2173a13d08054120f284ac06e7
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 06:53:31 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 16:53:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=b581c3f7

net/bridge.sh: Add support for network namespaces when using iproute2

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net/bridge.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/net/bridge.sh b/net/bridge.sh
index 4166215..a380f6a 100644
--- a/net/bridge.sh
+++ b/net/bridge.sh
@@ -12,19 +12,19 @@ _config_vars="$_config_vars bridge bridge_add brctl"
 
 _is_bridge()
 {
-	[ -d /sys/class/net/"${1:-${IFACE}}"/bridge ]
+	_netns [ -d /sys/class/net/"${1:-${IFACE}}"/bridge ]
 	return $?
 }
 
 _is_bridge_port()
 {
-	[ -d /sys/class/net/"${1:-${IFACE}}"/brport ]
+	_netns [ -d /sys/class/net/"${1:-${IFACE}}"/brport ]
 	return $?
 }
 
 _bridge_ports()
 {
-	for x in /sys/class/net/"${1:-${IFACE}}"/brif/*; do
+	for x in $(_netns glob /sys/class/net/"${1:-${IFACE}}"/brif/\*); do
 		n=${x##*/}
 		echo $n
 	done
@@ -82,7 +82,7 @@ bridge_pre_start()
 	if ! _is_bridge ; then
 		ebegin "Creating bridge ${IFACE}"
 		if ${do_iproute2}; then
-			ip link add "${IFACE}" type bridge
+			_netns ip link add "${IFACE}" type bridge
 			rc=$?
 		elif ${do_brctl}; then
 			brctl addbr "${IFACE}"
@@ -123,7 +123,7 @@ bridge_pre_start()
 	fi
 
 	# New configuration set mechanism, matches bonding
-	for x in /sys/class/net/"${IFACE}"/bridge/*; do
+	for x in $(_netns glob /sys/class/net/"${IFACE}"/bridge/\*); do
 		[ -f "${x}" ] || continue
 		n=${x##*/}
 		# keep no prefix for backward compatibility
@@ -132,7 +132,7 @@ bridge_pre_start()
 			if [ -n "${s}" ]; then
 				[ -z "${prefix}" ] && ewarn "sysfs key '${n}_${IFVAR}' should be prefixed, please add bridge_ prefix."
 				einfo "Setting ${n}: ${s}"
-				echo "${s}" >"${x}" || \
+				_netns echo "${s}" \>"${x}" || \
 				eerror "Failed to configure $n (${n}_${IFVAR})"
 			fi
 		done
@@ -154,7 +154,7 @@ bridge_pre_start()
 			# The interface is known to exist now
 			_up
 			if ${do_iproute2}; then
-				ip link set "${x}" master "${BR_IFACE}"
+				_netns ip link set "${x}" master "${BR_IFACE}"
 			elif ${do_brctl}; then
 				brctl addif "${BR_IFACE}" "${x}"
 			fi
@@ -163,7 +163,7 @@ bridge_pre_start()
 				return 1
 			fi
 			# Per-interface bridge settings
-			for x in /sys/class/net/"${IFACE}"/brport/*; do
+			for x in $(_netns glob /sys/class/net/"${IFACE}"/brport/\*); do
 				[ -f "${x}" ] || continue
 				n=${x##*/}
 				for prefix in "" brport_; do
@@ -171,7 +171,7 @@ bridge_pre_start()
 					if [ -n "${s}" ]; then
 						[ -z "${prefix}" ] && ewarn "sysfs key '${n}_${IFVAR}' should be prefixed, please add brport_ prefix."
 						einfo "Setting ${n}@${IFACE}: ${s}"
-						echo "${s}" >"${x}" || \
+						_netns echo "${s}" \>"${x}" || \
 						eerror "Failed to configure $n (${n}_${IFVAR})"
 					fi
 				done
@@ -194,7 +194,7 @@ bridge_post_stop()
 	if _is_bridge "${IFACE}"; then
 		ebegin "Destroying bridge ${IFACE}"
 		_down
-		for x in /sys/class/net/"${IFACE}"/brif/*; do
+		for x in $(_netns glob /sys/class/net/"${IFACE}"/brif/\*); do
 			[ -s $x ] || continue
 			n=${x##*/}
 			ports="${ports} ${n}"
@@ -206,8 +206,8 @@ bridge_post_stop()
 		# We are taking down an interface that is part of a bridge maybe
 		ports="${IFACE}"
 		local brport_dir="/sys/class/net/${IFACE}/brport"
-		[ -d ${brport_dir} ] || return 0
-		iface=$(readlink ${brport_dir}/bridge)
+		_netns [ -d ${brport_dir} ] || return 0
+		iface=$(_netns readlink ${brport_dir}/bridge)
 		iface=${iface##*/}
 		[ -z "${iface}" ] && return 0
 		extra=" from ${iface}"
@@ -218,7 +218,7 @@ bridge_post_stop()
 		local IFACE="${port}"
 		_set_flag -promisc
 		if type ip > /dev/null 2>&1; then
-			ip link set "${port}" nomaster
+			_netns ip link set "${port}" nomaster
 		else
 			brctl delif "${iface}" "${port}"
 		fi
@@ -228,7 +228,7 @@ bridge_post_stop()
 	if ${delete}; then
 		eoutdent
 		if type ip > /dev/null 2>&1; then
-			ip link del "${iface}"
+			_netns ip link del "${iface}"
 		else
 			brctl delbr "${iface}"
 		fi

next             reply	other threads:[~2021-03-11 16:54 UTC|newest]

Thread overview: 112+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-11 16:54 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-18 21:50 [gentoo-commits] proj/netifrc:master commit in: net/ Sam James
2025-03-18 21:50 Sam James
2025-03-18 21:50 Sam James
2024-09-29  0:28 Sam James
2024-09-23 12:02 Sam James
2024-09-09 22:43 Patrick McLean
2024-09-01  9:22 Sam James
2024-09-01  9:21 Sam James
2024-08-28 18:54 Patrick McLean
2024-06-11  0:39 Patrick McLean
2024-06-11  0:39 Patrick McLean
2024-05-23 18:12 Patrick McLean
2023-11-26  5:31 Robin H. Johnson
2023-11-25  4:52 Robin H. Johnson
2023-10-19 22:57 Sam James
2023-09-10 15:15 Sam James
2023-05-29  0:17 Mike Gilbert
2023-04-19 17:14 Robin H. Johnson
2023-04-17  4:35 Sam James
2023-02-12  6:54 Sam James
2023-01-19 18:50 Sam James
2023-01-19 18:50 Sam James
2023-01-17 15:06 Sam James
2023-01-17 15:06 Sam James
2023-01-17 15:06 Sam James
2023-01-15 20:37 Sam James
2023-01-15 14:03 Sam James
2023-01-15 14:03 Sam James
2023-01-15  1:53 Sam James
2023-01-15  1:51 Sam James
2023-01-15  1:51 Sam James
2022-12-25 19:14 Robin H. Johnson
2022-12-25 19:07 Robin H. Johnson
2021-03-31  1:11 Patrick McLean
2021-03-11 16:54 Lars Wendler
2021-03-11 16:54 Lars Wendler
2021-02-02  8:28 Lars Wendler
2021-01-27 16:55 Lars Wendler
2021-01-27 14:19 Lars Wendler
2021-01-27 14:06 Lars Wendler
2021-01-24 10:37 Lars Wendler
2021-01-18 14:40 Lars Wendler
2021-01-18 13:04 Lars Wendler
2021-01-18 12:33 Lars Wendler
2021-01-18 12:33 Lars Wendler
2021-01-05 14:27 Lars Wendler
2021-01-05 12:46 Lars Wendler
2021-01-05 12:46 Lars Wendler
2020-12-15 20:11 Lars Wendler
2020-06-02 21:54 Robin H. Johnson
2020-05-31  6:05 Robin H. Johnson
2020-05-31  5:42 Robin H. Johnson
2020-05-31  5:29 Robin H. Johnson
2020-05-31  5:29 Robin H. Johnson
2020-05-31  5:13 Robin H. Johnson
2020-05-31  5:13 Robin H. Johnson
2020-01-04  8:06 Robin H. Johnson
2020-01-04  7:59 Robin H. Johnson
2019-07-09 19:59 Ben Kohler
2019-07-09 19:59 Ben Kohler
2019-07-09 17:39 Ben Kohler
2019-04-21  4:11 Robin H. Johnson
2018-07-12  6:25 Robin H. Johnson
2018-07-10 21:11 Jason Donenfeld
2018-01-21 21:59 Robin H. Johnson
2017-11-27 20:22 Robin H. Johnson
2017-11-27 20:22 Robin H. Johnson
2017-11-14 20:48 Robin H. Johnson
2017-11-14 20:48 Robin H. Johnson
2017-10-21 20:56 Robin H. Johnson
2017-06-09 23:59 Robin H. Johnson
2017-06-09 23:55 Robin H. Johnson
2017-06-09 23:52 Robin H. Johnson
2017-06-09 23:52 Robin H. Johnson
2017-01-27 21:54 Robin H. Johnson
2016-10-27  1:23 Robin H. Johnson
2016-10-24 23:16 Robin H. Johnson
2016-10-24 20:58 Robin H. Johnson
2016-10-24 16:49 Robin H. Johnson
2016-10-24  0:25 Robin H. Johnson
2016-10-24  0:23 Robin H. Johnson
2016-10-24  0:23 Robin H. Johnson
2016-10-24  0:04 Robin H. Johnson
2016-10-24  0:04 Robin H. Johnson
2016-10-23 23:50 Robin H. Johnson
2016-10-23 23:50 Robin H. Johnson
2016-10-23 23:50 Robin H. Johnson
2016-10-23 22:39 Robin H. Johnson
2016-10-23 22:39 Robin H. Johnson
2016-10-05 14:42 Robin H. Johnson
2016-07-19 19:59 Robin H. Johnson
2016-07-05 18:14 Robin H. Johnson
2016-07-05 18:14 Robin H. Johnson
2016-07-05 18:14 Robin H. Johnson
2016-07-05 18:09 Robin H. Johnson
2015-11-08 14:33 Robin H. Johnson
2015-11-08 14:30 Robin H. Johnson
2015-05-25 10:04 Mike Frysinger
2015-05-25 10:04 Mike Frysinger
2015-05-25 10:04 Mike Frysinger
2015-05-25 10:01 Mike Frysinger
2015-01-22 23:01 Robin H. Johnson
2015-01-22 23:01 Robin H. Johnson
2014-12-11 18:13 Robin H. Johnson
2014-09-24  6:19 Robin H. Johnson
2014-07-17 17:56 Robin H. Johnson
2014-07-17 17:56 Robin H. Johnson
2014-04-15 18:18 Robin H. Johnson
2013-08-28 16:59 Robin H. Johnson
2013-08-27 20:06 Ian Stakenvicius
2013-08-25  8:17 Robin H. Johnson

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:4166215 dfblob:a380f6a )
 OR (
bs:"[gentoo-commits] proj/netifrc:master commit in: net/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1615481613.b581c3f76b95bd2173a13d08054120f284ac06e7.polynomial-c@OpenRC \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox