# 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"
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
- ip link set $IF up
+ if ip link show $IF > /dev/null 2>&1 ; then
+ : # The interface exists already (bad badness); let things fail
+ elif ifquery --state $IF >/dev/null 2>&1 ; then
+ # doesn't exist but has residue state; quiet cleanup
+ ifdown -f $IF > /dev/null 2>&1
+ fi
+ 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
BR="${C%=*}"
if [ -z "$BR" ] ; then
- ip link set $IF
- ifup $IF
+ ifup $IF || ip link set $IF up
else
+ ip link set $IF up
brctl addif $BR $IF
fi
i=$((i+1))
elif [ "$LIVE" != "$UPPER" ] ; then
# With UPPER = LOWER we rather make a bind mount to LIVE
env CONFIG="$CONFIG" $PREMOUNT "$UPPER"
- mount --bind $UPPER $LOWER
+ mount --bind $UPPER $LIVE
fi
grep ^SHARE= "$CONFIG" | while read A ; do
B="$(echo ${A#SHARE=})"
- D="$(realpath "$LOWER$B")"
+ D="$(realpath "$B")"
[ "$D" = "$LOWER" ] && continue
if [ -d "$D" ] ; then
- echo bind mount $D onto $LIVE$D
+ echo bind mount $D onto $LIVE$B
mkdir -p $LIVE$D
- mount --bind $D $LIVE$D
+ mount --bind $D $LIVE$B
fi
done