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

dhcpcd: fix privsep enabling, passthru enablePrivSep

Browse source 
dhcpcd automatically enables privsep if it can find a suitably named
user on the system, which makes it impossible to build dhcpcd without
privsep on a system that's currently running dhcpcd with privsep
enabled.

also passthru whether privsep is enabled so that the module can check
it.
This commit is contained in:
pennae 2021-12-22 18:21:36 +01:00
parent b3c4e64b31
commit 800151e6af
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/tools/networking/dhcpcd/default.nix
View file

@ -34,12 +34,16 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
] ]
++ lib.optionals enablePrivSep [ ++ (
"--enable-privsep" if ! enablePrivSep
# dhcpcd disables privsep if it can't find the default user, then [ "--disable-privsep" ]
# so we explicitly specify a user. else [
"--privsepuser=dhcpcd" "--enable-privsep"
]; # dhcpcd disables privsep if it can't find the default user,
# so we explicitly specify a user.
"--privsepuser=dhcpcd"
]
);
makeFlags = [ "PREFIX=${placeholder "out"}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
@ -50,7 +54,10 @@ stdenv.mkDerivation rec {
# Check that the udev plugin got built. # Check that the udev plugin got built.
postInstall = lib.optionalString (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; postInstall = lib.optionalString (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
passthru.tests = { inherit (nixosTests.networking.scripted) macvlan dhcpSimple dhcpOneIf; }; passthru = {
inherit enablePrivSep;
tests = { inherit (nixosTests.networking.scripted) macvlan dhcpSimple dhcpOneIf; };
};
meta = with lib; { meta = with lib; {
description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; description = "A client for the Dynamic Host Configuration Protocol (DHCP)";