From: WANG Chao Date: Mon, 1 Apr 2013 12:34:40 +0000 (+0800) Subject: ifup.sh: Add support for bridge over team and vlan tagged team X-Git-Tag: 028~85 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a55f910cf6f13e1a6d9d5be769297ee3ecc64bb9;p=thirdparty%2Fdracut.git ifup.sh: Add support for bridge over team and vlan tagged team Team is the same network stack as bonding. Therefore give ifup the ability to handle bridge over team and vlan tagged team as bonding too. Signed-off-by: WANG Chao --- diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh index 582278f5b..815ab64f4 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -46,6 +46,8 @@ if [ -e /tmp/bridge.info ]; then if [ "$netif" = "$ethname" ]; then if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then : # We need to really setup bond (recursive call) + elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then + : # We need to really setup team (recursive call) else netif="$bridgename" use_bridge='true' @@ -59,6 +61,8 @@ if [ -e /tmp/vlan.info ]; then if [ "$netif" = "$phydevice" ]; then if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then : # We need to really setup bond (recursive call) + elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then + : # We need to really setup team (recursive call) else netif="$vlanname" use_vlan='true' @@ -212,6 +216,8 @@ if [ -e /tmp/bridge.info ]; then for ethname in $ethnames ; do if [ "$ethname" = "$bondname" ] ; then DO_BOND_SETUP=yes ifup $bondname -m + elif [ "$ethname" = "$teammaster" ] ; then + DO_TEAM_SETUP=yes ifup $teammaster -m else linkup $ethname fi @@ -235,6 +241,8 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then modprobe 8021q if [ "$phydevice" = "$bondname" ] ; then DO_BOND_SETUP=yes ifup $phydevice -m + elif [ "$phydevice" = "$teammaster" ] ; then + DO_TEAM_SETUP=yes ifup $phydevice -m else linkup "$phydevice" fi