X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=functions;h=8d2d5f3661a786943df9d1f20ed028ac6984690c;hb=7bf7a4a1f847eed595b09c7e17743b93cec26f36;hp=2fa68ccf2de35cad8232b355ab57f6a849d1fcb2;hpb=3e2ed38e99cc3a02220bf734b70e74e57dbe6e26;p=rrq%2Foverlay-boot.git

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