Skip to content

Commit

Permalink
dhcpcd: bring back enablePrivSep option, nixos/release-notes: remove …
Browse files Browse the repository at this point in the history
…duplicate note (#347578)
  • Loading branch information
rnhmjoj authored Oct 12, 2024
2 parents 6035854 + fb28bba commit 3106e48
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 0 additions & 2 deletions nixos/doc/manual/release-notes/rl-2411.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -615,8 +615,6 @@

- `nixosTests` now provide a working IPv6 setup for VLAN 1 by default.

- `services.dhcpcd` is now started with additional systemd sandbox/hardening options for better security. When using `networking.dhcpcd.runHook` these settings are not applied.

- Kanidm can now be provisioned using the new [`services.kanidm.provision`] option, but requires using a patched version available via `pkgs.kanidm.withSecretProvisioning`.

- Kanidm previously had an incorrect systemd service type, causing dependent units with an `after` and `requires` directive to start before `kanidm*` finished startup. The module has now been updated in line with upstream recommendations.
Expand Down
4 changes: 3 additions & 1 deletion pkgs/tools/networking/dhcpcd/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
, runtimeShellPackage
, runtimeShell
, nixosTests
, enablePrivSep ? false
}:

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -39,7 +40,8 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
"--disable-privsep"
"--dbdir=/var/lib/dhcpcd"
];
(lib.enableFeature enablePrivSep "privsep")
] ++ lib.optional enablePrivSep "--privsepuser=dhcpcd";

makeFlags = [ "PREFIX=${placeholder "out"}" ];

Expand Down

0 comments on commit 3106e48

Please sign in to comment.