commit a3d67f417e443d84b6764f4b95122019ed9f38cb · pyrox.dev/nixpkgs

+38 -2
nixos/modules/system/boot/networkd.nix
···

       49
       49
        
           (assertValueOneOf "Kind" [

     

       50
       50
        
             "bond" "bridge" "dummy" "gre" "gretap" "ip6gre" "ip6tnl" "ip6gretap" "ipip"

     

       51
       51
        
             "ipvlan" "macvlan" "macvtap" "sit" "tap" "tun" "veth" "vlan" "vti" "vti6"

     

       52
       52
       -
             "vxlan" "geneve" "vrf" "vcan" "vxcan" "wireguard" "netdevsim"

     

       52
       52
       +
             "vxlan" "geneve" "vrf" "vcan" "vxcan" "wireguard" "netdevsim" "xfrm"

     

       53
       53
        
           ])

     

       54
       54
        
           (assertByteFormat "MTUBytes")

     

       55
       55
        
           (assertMacAddress "MACAddress")

     
···

       172
       172
        
           (assertValueOneOf "AllSlavesActive" boolValues)

     

       173
       173
        
         ];

     

       174
       174
        
       

     

       175
       175
       +
         checkXfrm = checkUnitConfig "Xfrm" [

     

       176
       176
       +
           (assertOnlyFields [

     

       177
       177
       +
             "InterfaceId" "Independent"

     

       178
       178
       +
           ])

     

       179
       179
       +
           (assertRange "InterfaceId" 1 4294967295)

     

       180
       180
       +
           (assertValueOneOf "Independent" boolValues)

     

       181
       181
       +
         ];

     

       182
       182
       +
       

     

       175
       183
        
         checkNetwork = checkUnitConfig "Network" [

     

       176
       184
        
           (assertOnlyFields [

     

       177
       185
        
             "Description" "DHCP" "DHCPServer" "LinkLocalAddressing" "IPv4LLRoute"

     
···

       182
       190
        
             "IPv6HopLimit" "IPv4ProxyARP" "IPv6ProxyNDP" "IPv6ProxyNDPAddress"

     

       183
       191
        
             "IPv6PrefixDelegation" "IPv6MTUBytes" "Bridge" "Bond" "VRF" "VLAN"

     

       184
       192
        
             "IPVLAN" "MACVLAN" "VXLAN" "Tunnel" "ActiveSlave" "PrimarySlave"

     

       185
       185
       -
             "ConfigureWithoutCarrier"

     

       193
       193
       +
             "ConfigureWithoutCarrier" "Xfrm"

     

       186
       194
        
           ])

     

       187
       195
        
           # Note: For DHCP the values both, none, v4, v6 are deprecated

     

       188
       196
        
           (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6" "both" "none" "v4" "v6"])

     
···

       477
       485
        
             '';

     

       478
       486
        
           };

     

       479
       487
        
       

     

       488
       488
       +
           xfrmConfig = mkOption {

     

       489
       489
       +
             default = {};

     

       490
       490
       +
             example = { InterfaceId = 1; };

     

       491
       491
       +
             type = types.addCheck (types.attrsOf unitOption) checkXfrm;

     

       492
       492
       +
             description = ''

     

       493
       493
       +
               Each attribute in this set specifies an option in the

     

       494
       494
       +
               <literal>[Xfrm]</literal> section of the unit.  See

     

       495
       495
       +
               <citerefentry><refentrytitle>systemd.netdev</refentrytitle>

     

       496
       496
       +
               <manvolnum>5</manvolnum></citerefentry> for details.

     

       497
       497
       +
             '';

     

       498
       498
       +
           };

     

       499
       499
       +
       

     

       480
       500
        
         };

     

       481
       501
        
       

     

       482
       502
        
         addressOptions = {

     
···

       712
       732
        
             '';

     

       713
       733
        
           };

     

       714
       734
        
       

     

       735
       735
       +
           xfrm = mkOption {

     

       736
       736
       +
             default = [ ];

     

       737
       737
       +
             type = types.listOf types.str;

     

       738
       738
       +
             description = ''

     

       739
       739
       +
               A list of xfrm interfaces to be added to the network section of the

     

       740
       740
       +
               unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>

     

       741
       741
       +
               <manvolnum>5</manvolnum></citerefentry> for details.

     

       742
       742
       +
             '';

     

       743
       743
       +
           };

     

       744
       744
       +
       

     

       715
       745
        
           addresses = mkOption {

     

       716
       746
        
             default = [ ];

     

       717
       747
        
             type = with types; listOf (submodule addressOptions);

     
···

       810
       840
        
                   ${attrsToSection def.bondConfig}

     

       811
       841
        
       

     

       812
       842
        
                 ''}

     

       843
       843
       +
                 ${optionalString (def.xfrmConfig != { }) ''

     

       844
       844
       +
                   [Xfrm]

     

       845
       845
       +
                   ${attrsToSection def.xfrmConfig}

     

       846
       846
       +
       

     

       847
       847
       +
                 ''}

     

       813
       848
        
                 ${optionalString (def.wireguardConfig != { }) ''

     

       814
       849
        
                   [WireGuard]

     

       815
       850
        
                   ${attrsToSection def.wireguardConfig}

     
···

       847
       882
        
                 ${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)}

     

       848
       883
        
                 ${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)}

     

       849
       884
        
                 ${concatStringsSep "\n" (map (s: "Tunnel=${s}") def.tunnel)}

     

       885
       885
       +
                 ${concatStringsSep "\n" (map (s: "Xfrm=${s}") def.xfrm)}

     

       850
       886
        
       

     

       851
       887
        
                 ${optionalString (def.dhcpConfig != { }) ''

     

       852
       888
        
                   [DHCP]