From 400b45d590b883050e171a34daec3fe40b58b76e Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sun, 12 Dec 2010 00:43:05 +0000 Subject: Final documentation cleanup for updated bridge code. Specifically document how to handle the case of explicitly starting a bridge and then dynamically adding interfaces to it. brctl_br0='' bridge_add_eth0='br0' --- net/bridge.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'net') diff --git a/net/bridge.sh b/net/bridge.sh index 2f6711e..c0172ed 100644 --- a/net/bridge.sh +++ b/net/bridge.sh @@ -32,16 +32,19 @@ _bridge_ports() bridge_pre_start() { local brif= oiface="${IFACE}" e= x= + # ports is for static add local ports="$(_get_array "bridge_${IFVAR}")" + # old config options local opts="$(_get_array "brctl_${IFVAR}")" - # brif is used for dynamic add eval brif=\$bridge_add_${IFVAR} - # ports is for static add + + # we need a way to if the bridge exists in a variable name, not just the + # contents of a variable. Eg if somebody has only bridge_add_eth0='br0', + # with no other lines mentioning br0. eval bridge_unset=\${bridge_${IFVAR}-y\} eval brctl_unset=\${brctl_${IFVAR}-y\} - # If we are not doing dynamic add on $IFACE, check for static ports. if [ -z "${brif}" -a "${brctl_unset}" == 'y' ]; then if [ -z "${ports}" -a "${bridge_unset}" == "y" ]; then #eerror "Misconfigured static bridge detected (see net.example)" -- cgit v1.2.3