From: Ralph Ronnquist Date: Sat, 27 May 2023 07:26:37 +0000 (+1000) Subject: Added vlan setup support X-Git-Tag: v0.1.13~9 X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=7bf7a4a1f847eed595b09c7e17743b93cec26f36;p=rrq%2Foverlay-boot.git Added vlan setup support --- diff --git a/functions b/functions index 2fa68cc..8d2d5f3 100644 --- a/functions +++ b/functions @@ -92,6 +92,9 @@ EOF # Setup the network namespace for the given $CABLES # $1=netns ( $2="br=mac" .. ) +# br is optional, mac is optional. +# If mac is .N then it's taken as vlan tag on prior outer interface +# (with ifup configuration) and the inner interface is left alone. setup_veth_cables() { local NETNS BR IF MAC C i ADD NETNS="$1" @@ -100,12 +103,21 @@ setup_veth_cables() { for C in "$@" ; do IF=$NETNS$i MAC="${C#*=}" - [ -z "$MAC" ] || MAC="address $MAC" - ip link add $IF type veth peer name eth$i $MAC netns $NETNS + if [ -z "$MAC" ] ; then + # set up veth with "random" mac address + ip link add $IF type veth peer name eth$i netns $NETNS + elif [ -z "${MAC%%.*}" ] ; then + # set up a host vlan with specified tag on previous eth + i=$((i-1)) + IF=$NETNS$i$MAC + ifup $IF + else + # set up veth with specified mac address + ip link add $IF type veth peer name eth$i address $MAC netns $NETNS + fi ip link set $IF up BR="${C%=*}" if [ -z "$BR" ] ; then - ip link set $IF ifup $IF else brctl addif $BR $IF