From 0cb8669638ee09c792f741455ae2cbbb4374fad5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 17 Dec 2021 19:23:00 +0100
Subject: [PATCH] dhcpcd: use dhcpcd as privsep user

---
 nixos/modules/services/networking/dhcpcd.nix | 6 +++---
 pkgs/tools/networking/dhcpcd/default.nix     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 0c69caa64bba..61a8c13a70c6 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -214,11 +214,11 @@ in
           };
       };
 
-    users.users._dhcpcd = {
+    users.users.dhcpcd = {
       isSystemUser = true;
-      group = "_dhcpcd";
+      group = "dhcpcd";
     };
-    users.groups._dhcpcd = {};
+    users.groups.dhcpcd = {};
 
     environment.systemPackages = [ dhcpcd ];
 
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 2f27956a7973..d60c87e51ff9 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
   ++ lib.optionals enablePrivSep [
     "--enable-privsep"
     # dhcpcd disables privsep if it can't find the default user,
-    # so we explicitly specify the default.
-    "--privsepuser=_dhcpcd"
+    # so we explicitly specify a user.
+    "--privsepuser=dhcpcd"
   ];
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];