commit c417012c1b1ed3793ac3bd106bfc840d9aad08c7 · pyrox.dev/nixpkgs

+16 -3
nixos/modules/services/networking/dhcpcd.nix
···

       8
       8
        
       

     

       9
       9
        
         cfg = config.networking.dhcpcd;

     

       10
       10
        
       

     

       11
       11
       +
         interfaces = attrValues config.networking.interfaces;

     

       12
       12
       +
       

     

       13
       13
       +
         enableDHCP = config.networking.useDHCP || any (i: i.useDHCP == true) interfaces;

     

       14
       14
       +
       

     

       11
       15
        
         # Don't start dhcpcd on explicitly configured interfaces or on

     

       12
       16
        
         # interfaces that are part of a bridge, bond or sit device.

     

       13
       17
        
         ignoredInterfaces =

     

       14
       14
       -
           map (i: i.name) (filter (i: if i.useDHCP != null then i.useDHCP else i.ip4 != [ ] || i.ipAddress != null) (attrValues config.networking.interfaces))

     

       18
       18
       +
           map (i: i.name) (filter (i: if i.useDHCP != null then i.useDHCP else i.ip4 != [ ] || i.ipAddress != null) interfaces)

     

       15
       19
        
           ++ mapAttrsToList (i: _: i) config.networking.sits

     

       16
       20
        
           ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))

     

       17
       21
        
           ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))

     

       18
       22
        
           ++ config.networking.dhcpcd.denyInterfaces;

     

       23
       23
       +
       

     

       24
       24
       +
         arrayAppendOrNull = a1: a2: if a1 == null && a2 == null then null

     

       25
       25
       +
           else if a1 == null then a2 else if a2 == null then a1

     

       26
       26
       +
             else a1 ++ a2;

     

       27
       27
       +
       

     

       28
       28
       +
         # If dhcp is disabled but explicit interfaces are enabled,

     

       29
       29
       +
         # we need to provide dhcp just for those interfaces.

     

       30
       30
       +
         allowInterfaces = arrayAppendOrNull cfg.allowInterfaces

     

       31
       31
       +
           (if !cfg.useDHCP && enableDHCP then map (i: i.name) (filter (i: i.useDHCP == true) interfaces) else null);

     

       19
       32
        
       

     

       20
       33
        
         # Config file adapted from the one that ships with dhcpcd.

     

       21
       34
        
         dhcpcdConf = pkgs.writeText "dhcpcd.conf"

     
···

       41
       54
        
             denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet* sit*

     

       42
       55
        
       

     

       43
       56
        
             # Use the list of allowed interfaces if specified

     

       44
       44
       -
             ${optionalString (cfg.allowInterfaces != null) "allowinterfaces ${toString cfg.allowInterfaces}"}

     

       57
       57
       +
             ${optionalString (allowInterfaces != null) "allowinterfaces ${toString allowInterfaces}"}

     

       45
       58
        
       

     

       46
       59
        
             ${cfg.extraConfig}

     

       47
       60
        
           '';

     
···

       133
       146
        
       

     

       134
       147
        
         ###### implementation

     

       135
       148
        
       

     

       136
       136
       -
         config = mkIf config.networking.useDHCP {

     

       149
       149
       +
         config = mkIf enableDHCP {

     

       137
       150
        
       

     

       138
       151
        
           systemd.services.dhcpcd =

     

       139
       152
        
             { description = "DHCP Client";