Unverified Commit 6f66c57a authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #241365 from RaitoBezarius/macaddrs-netdevs 

nixos/networkd: support netdev MAC addresses
parents 05f22063 4d38fa04

nixos/lib/systemd-lib.nix

+6 −1
Original line number Diff line number Diff line
@@ -63,7 +63,12 @@ in rec { 


  assertMacAddress = name: group: attr:

    optional (attr ? ${name} && ! isMacAddress attr.${name})

      "Systemd ${group} field `${name}' must be a valid mac address.";

      "Systemd ${group} field `${name}' must be a valid MAC address.";



  assertNetdevMacAddress = name: group: attr:

    optional (attr ? ${name} && (! isMacAddress attr.${name} || attr.${name} != "none"))

      "Systemd ${group} field `${name}` must be a valid MAC address or the special value `none`.";





  isPort = i: i >= 0 && i <= 65535;

nixos/modules/system/boot/networkd.nix

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ let 
          "batadv"

        ])

        (assertByteFormat "MTUBytes")

        (assertMacAddress "MACAddress")

        (assertNetdevMacAddress "MACAddress")

      ];



      sectionVLAN = checkUnitConfig "VLAN" [