kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge dnsmasq ipv4 and ipv6 files

Browse Source 
Signed-off-by: Timothy Middelkoop <tmiddelkoop@internet2.edu>
This commit is contained in:
Timothy Middelkoop
2025-11-29 02:12:19 +00:00
parent 4c82de92c7
commit 223f56a330
6 changed files with 60 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
overlays/systemd.networkd/internal/systemd_networkd_test.go
View File

@@ -69,6 +69,7 @@ MACAddress=e6:92:39:49:7b:03
DHCP=no
Address=192.168.3.21/24
Gateway=192.168.3.1
[Link]
MTUBytes=1500
backupFile: true
@@ -83,9 +84,11 @@ MACAddress=9a:77:29:73:14:f1
DHCP=no
Address=192.168.3.22/24
Gateway=192.168.3.1
IPv6AcceptRA=no
IPv6PrivacyExtensions=false
Address=2001:db8::23/64
Gateway=2001:db8::1
[Link]
MTUBytes=9000
@@ -94,7 +97,7 @@ Destination=192.168.1.0/24
Gateway=192.168.3.254
[DHCPv6]
UseAddress=no
DUIDType=link-layer
`
const expected_log_without_hwaddr string = `backupFile: true
@@ -109,6 +112,7 @@ Name=wwnet0
DHCP=no
Address=192.168.3.21/24
Gateway=192.168.3.1
[Link]
MTUBytes=1500
backupFile: true
@@ -122,9 +126,11 @@ Name=wwnet1
DHCP=no
Address=192.168.3.22/24
Gateway=192.168.3.1
IPv6AcceptRA=no
IPv6PrivacyExtensions=false
Address=2001:db8::23/64
Gateway=2001:db8::1
[Link]
MTUBytes=9000
@@ -133,5 +139,5 @@ Destination=192.168.1.0/24
Gateway=192.168.3.254
[DHCPv6]
UseAddress=no
DUIDType=link-layer
`

4
overlays/systemd.networkd/rootfs/etc/systemd/network/default.network.ww
View File

@@ -20,6 +20,7 @@ Address={{ $netdev.IpCIDR }}
Gateway={{ $netdev.Gateway }}
{{- end }}
{{- if $netdev.IpCIDR6 }}
IPv6AcceptRA=no
IPv6PrivacyExtensions=false
Address={{ $netdev.IpCIDR6 }}
{{- end }}
@@ -33,6 +34,7 @@ DNS={{ $tv }}
{{- end }}
{{- if $netdev.MTU }}
[Link]
MTUBytes={{ $netdev.MTU }}
{{- end }}
@@ -49,7 +51,7 @@ Gateway={{ index $route 1 }}
{{- if $netdev.Ipaddr6 }}
[DHCPv6]
UseAddress=no
DUIDType=link-layer
{{ end -}}
{{ end -}}