WIP: router: move wan ipv4 configuration from dhcpcd to networkd

This commit is contained in:
Yuri Tatishchev 2025-03-18 00:11:49 -07:00
parent ad61c36b76
commit 51c03e46e5
Signed by: CaZzzer
GPG Key ID: E0EBF441EA424369

View File

@ -58,11 +58,12 @@ in
nohook resolv.conf, yp, hostname, ntp nohook resolv.conf, yp, hostname, ntp
interface ${ifs.wan.name} interface ${ifs.wan.name}
ipv6only
# IPv4 (Static) # IPv4 (Static)
nodhcp # nodhcp
noipv4ll # noipv4ll
static ip_address=${ifs.wan.addr4Sized} # static ip_address=${ifs.wan.addr4Sized}
static routers=${ifs.wan.gw4} # static routers=${ifs.wan.gw4}
# IPv6 # IPv6
duid duid
@ -127,10 +128,24 @@ in
networks = { networks = {
"10-wan" = { "10-wan" = {
matchConfig.Name = ifs.wan.name; matchConfig.Name = ifs.wan.name;
linkConfig = {
Unmanaged = true; # linkConfig = {
RequiredForOnline = "routable"; # Unmanaged = true;
# RequiredForOnline = "routable";
# };
# make routing on this interface a dependency for network-online.target
linkConfig.RequiredForOnline = "routable";
networkConfig = {
# start a DHCP Client for IPv4 Addressing/Routing
# DHCP = "ipv4";
# accept Router Advertisements for Stateless IPv6 Autoconfiguraton (SLAAC)
# let dhcpcd handle this
Address = [ ifs.wan.addr4Sized ];
IPv6AcceptRA = false;
}; };
routes = [
{ Gateway = ifs.wan.gw4; }
];
}; };
"20-lan" = (mkLanConfig ifs.lan) // { "20-lan" = (mkLanConfig ifs.lan) // {
vlan = [ vlan = [