mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-12 13:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1412 from bergware/master

Browse Source 
vhost and shim network: assign predefined MAC address
This commit is contained in:
tom mortensen
2023-08-15 12:45:14 -07:00
committed by GitHub
parent 94be1b77c9 6831de2529
commit 9490d06b2a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
etc/rc.d/rc.docker
View File

@@ -480,7 +480,8 @@ start_network(){
if [[ $DOCKER_ALLOW_ACCESS == yes && -n $IPV4 ]]; then
if [[ ! -e $SYSTEM/$LINK && -n $SHIM_BASE ]]; then
# create shim network
ip link add $LINK link $NETWORK type $ATTACH mode $MODE
MAC=$(echo $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
ip link set $LINK up

5
etc/rc.d/rc.inet1
View File

@@ -257,12 +257,13 @@ macvtap_up(){
PARENT=${IFNAME[$i]}
[[ -n ${BONDNICS[$i]} ]] && PARENT=${BONDNAME[$i]}
VTAP=vhost${PARENT//[^0-9]/}
run ip link add link $PARENT name $VTAP type macvtap mode bridge
MAC=$(echo $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
for ((j=1;j<${VLANS[$i]:-0};j++)); do
VLAN=${VLANID[$i,$j]}
run ip link add link $PARENT.$VLAN name $VTAP.$VLAN type macvtap mode bridge
run ip link add link $PARENT.$VLAN name $VTAP.$VLAN address $MAC type macvtap mode bridge
set_mtu $VTAP.$VLAN
run ip link set $VTAP.$VLAN up 2>/dev/null
done