b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

networkmanager: remove dhcp and pass dhcpcd instead

Browse source 
The ISC DHCP client has reached its end of life.
This commit is contained in:
Martin Weinelt 2022-03-30 20:43:16 +02:00
parent a2c379d4b6
commit a31f123c1c
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/networking/networkmanager.nix
View file

@ -237,7 +237,7 @@ in {
};
dhcp = mkOption {
type = types.enum [ "dhclient" "dhcpcd" "internal" ];
type = types.enum [ "dhcpcd" "internal" ];
default = "internal";
description = ''
Which program (or internal library) should be used for DHCP.
@ -497,7 +497,6 @@ in {
"d /etc/ipsec.d 0700 root root -"
"d /var/lib/NetworkManager-fortisslvpn 0700 root root -"
"d /var/lib/dhclient 0755 root root -"
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
];

8
pkgs/tools/networking/networkmanager/default.nix
View file

@ -12,7 +12,7 @@
, polkit
, gnutls
, ppp
, dhcp
, dhcpcd
, iptables
, nftables
, python3
@ -96,9 +96,9 @@ stdenv.mkDerivation rec {
"-Dresolvconf=${openresolv}/bin/resolvconf"
# DHCP clients
"-Ddhclient=${dhcp}/bin/dhclient"
# Upstream prefers dhclient, so don't add dhcpcd to the closure
"-Ddhcpcd=no"
# ISC DHCP client has reached it's end of life, so stop using it
"-Ddhclient=no"
"-Ddhcpcd=${dhcpcd}/bin/dhcpcd"
"-Ddhcpcanon=no"
# Miscellaneous