colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/networkd: add [IPVLAN] and [IPVTAP] configuration options to systemd.netdev files

Browse Source 
[IPVLAN](https://www.freedesktop.org/software/systemd/man/latest/systemd.netdev.html#%5BIPVLAN%5D%20Section%20Options)
[IPVTAP](https://www.freedesktop.org/software/systemd/man/latest/systemd.netdev.html#%5BIPVTAP%5D%20Section%20Options)
This commit is contained in:
Philip Taron 2023-11-17 13:08:18 -08:00 committed by Jörg Thalheim
parent 7686f24675
commit bc7a939ced
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/lib/systemd-network-units.nix
View File

@ -23,6 +23,12 @@ in {
'' + optionalString (def.vlanConfig != { }) ''
[VLAN]
${attrsToSection def.vlanConfig}
'' + optionalString (def.ipvlanConfig != { }) ''
[IPVLAN]
${attrsToSection def.ipvlanConfig}
'' + optionalString (def.ipvtapConfig != { }) ''
[IPVTAP]
${attrsToSection def.ipvtapConfig}
'' + optionalString (def.macvlanConfig != { }) ''
[MACVLAN]
${attrsToSection def.macvlanConfig}

34
nixos/modules/system/boot/networkd.nix
View File

@ -122,6 +122,16 @@ let
(assertValueOneOf "PacketInfo" boolValues)
(assertValueOneOf "VNetHeader" boolValues)
];
# See https://www.freedesktop.org/software/systemd/man/latest/systemd.netdev.html#%5BIPVTAP%5D%20Section%20Options
ipVlanVtapChecks = [
(assertOnlyFields [
"Mode"
"Flags"
])
(assertValueOneOf "Mode" ["L2" "L3" "L3S" ])
(assertValueOneOf "Flags" ["private" "vepa" "bridge" ])
];
in {
sectionNetdev = checkUnitConfig "Netdev" [
@ -192,6 +202,10 @@ let
(assertValueOneOf "ReorderHeader" boolValues)
];
sectionIPVLAN = checkUnitConfig "IPVLAN" ipVlanVtapChecks;
sectionIPVTAP = checkUnitConfig "IPVTAP" ipVlanVtapChecks;
sectionMACVLAN = checkUnitConfig "MACVLAN" [
(assertOnlyFields [
"Mode"
@ -1625,6 +1639,26 @@ let
'';
};
ipvlanConfig = mkOption {
default = {};
example = { Mode = "L2"; Flags = "private"; };
type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionIPVLAN;
description = lib.mdDoc ''
Each attribute in this set specifies an option in the `[IPVLAN]` section of the unit.
See {manpage}`systemd.netdev(5)` for details.
'';
};
ipvtapConfig = mkOption {
default = {};
example = { Mode = "L3"; Flags = "vepa"; };
type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionIPVTAP;
description = lib.mdDoc ''
Each attribute in this set specifies an option in the `[IPVTAP]` section of the unit.
See {manpage}`systemd.netdev(5)` for details.
'';
};
macvlanConfig = mkOption {
default = {};
example = { Mode = "private"; };