support tap mac addr

This commit is contained in:
Sagar Ch 2024-06-07 02:57:17 +00:00
parent 0d9e299595
commit 3d27f32c03

View file

@ -18,6 +18,7 @@ let
{ {
name = lanName; name = lanName;
iface = tapInterfaceName; iface = tapInterfaceName;
mac = tapCfg.mac;
create = '' create = ''
ip tuntap add dev ${tapInterfaceName} mode tap ip tuntap add dev ${tapInterfaceName} mode tap
ip link set dev ${tapInterfaceName} up ip link set dev ${tapInterfaceName} up
@ -36,6 +37,7 @@ let
{ {
name = macvtapName; name = macvtapName;
iface = macvtapInterfaceName; iface = macvtapInterfaceName;
mac = macvtapCfg.mac;
create = '' create = ''
ip link add link ${macvtapNetworkCfg.uplink.iface} name ${macvtapInterfaceName} type macvtap mode bridge ip link add link ${macvtapNetworkCfg.uplink.iface} name ${macvtapInterfaceName} type macvtap mode bridge
ip link set ${macvtapInterfaceName} netns ${netName}.vmix ip link set ${macvtapInterfaceName} netns ${netName}.vmix
@ -86,7 +88,7 @@ let
-virtfs local,path=${toString shareCfg.source},security_model=passthrough,mount_tag=${shareCfg.target} \ -virtfs local,path=${toString shareCfg.source},security_model=passthrough,mount_tag=${shareCfg.target} \
'') (attrValues vmCfg.shares)} \ '') (attrValues vmCfg.shares)} \
${concatMapStrings (tapCfg: '' ${concatMapStrings (tapCfg: ''
-device virtio-net-pci,netdev=lan-${tapCfg.name} \ -device virtio-net-pci,netdev=lan-${tapCfg.name},mac=${tapCfg.mac} \
-netdev tap,id=lan-${tapCfg.name},ifname=${tapCfg.iface},script=no,downscript=no \ -netdev tap,id=lan-${tapCfg.name},ifname=${tapCfg.iface},script=no,downscript=no \
'') allTaps} \ '') allTaps} \
${optionalString cfg.network.user.enable " ${optionalString cfg.network.user.enable "