emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow bridge interfaces to be called bridge.

Browse Source
This commit is contained in:
Trevor Summers Smith 2010-02-09 17:10:04 +00:00 committed by Roy Marples
parent ecf9ef49a7
commit c0f5f2122c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/bridge.sh
View File

@ -11,7 +11,8 @@ _config_vars="$_config_vars bridge bridge_add brctl"
_is_bridge() _is_bridge()
{ {
brctl show 2>/dev/null | grep -q "^${IFACE}[[:space:]]" # Ignore header line so as to allow for bridges named 'bridge'
brctl show 2>/dev/null | sed '1,1d' | grep -q "^${IFACE}[[:space:]]"
} }
bridge_pre_start() bridge_pre_start()
@ -88,14 +89,16 @@ bridge_post_stop()
if _is_bridge; then if _is_bridge; then
ebegin "Destroying bridge ${IFACE}" ebegin "Destroying bridge ${IFACE}"
_down _down
# Ignore header line so as to allow for bridges named 'bridge'
ports="$(brctl show 2>/dev/null | \ ports="$(brctl show 2>/dev/null | \
sed -n -e '/^'"${IFACE}"'[[:space:]]/,/^\S/ { /^\('"${IFACE}"'[[:space:]]\|\t\)/s/^.*\t//p }')" sed -n -e '1,1d' -e '/^'"${IFACE}"'[[:space:]]/,/^\S/ { /^\('"${IFACE}"'[[:space:]]\|\t\)/s/^.*\t//p }')"
delete=true delete=true
iface=${IFACE} iface=${IFACE}
eindent eindent
else else
# Work out if we're added to a bridge for removal or not # Work out if we're added to a bridge for removal or not
eval set -- $(brctl show 2>/dev/null | sed -e "s/'/'\\\\''/g" -e "s/$/'/g" -e "s/^/'/g") # Ignore header line so as to allow for bridges named 'bridge'
eval set -- $(brctl show 2>/dev/null | sed -e '1,1d' -e "s/'/'\\\\''/g" -e "s/$/'/g" -e "s/^/'/g")
local line= local line=
for line; do for line; do
set -- ${line} set -- ${line}