Merge pull request #1413 from bergware/master

vhost and shim network: assign predefined MAC address
This commit is contained in:
tom mortensen
2023-08-15 14:30:59 -07:00
committed by GitHub
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -480,7 +480,7 @@ start_network(){
if [[ $DOCKER_ALLOW_ACCESS == yes && -n $IPV4 ]]; then
if [[ ! -e $SYSTEM/$LINK && -n $SHIM_BASE ]]; then
# create shim network
MAC=$(echo $NETWORK|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')
MAC=$(echo $(hostname -s)-$NETWORK|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')
ip link add $LINK link $NETWORK address $MAC type $ATTACH mode $MODE
# disable ipv6 on shim network
echo 1 > $CONF6/$LINK/disable_ipv6
+1 -1
View File
@@ -257,7 +257,7 @@ macvtap_up(){
PARENT=${IFNAME[$i]}
[[ -n ${BONDNICS[$i]} ]] && PARENT=${BONDNAME[$i]}
VTAP=vhost${PARENT//[^0-9]/}
MAC=$(echo $VTAP|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')
MAC=$(echo $(hostname -s)-$VTAP|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')
run ip link add link $PARENT name $VTAP address $MAC type macvtap mode bridge
set_mtu $VTAP
run ip link set $VTAP up 2>/dev/null