diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-01-31 16:43:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-31 16:43:54 +0100 |
| commit | 9118823ed368161ed172e54a365e6148523758a2 (patch) | |
| tree | 0a6112aa6d31fcbc0567f6e37e0229397e7f07ec | |
| parent | 071b4833b4326de76e598e70fb3c5187d8234cf8 (diff) | |
| parent | 1af95a24c11402f46f8ab055a3fb14458f65bd70 (diff) | |
Merge pull request #226532 from SuperSandro2000/dhcpcd
dhcpcd: change files after patching; nixos/dhcpcd: link dhcpcd.conf to /etc/ to fix dhcpcd -k
| -rw-r--r-- | nixos/modules/services/networking/dhcpcd.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/dhcpcd/default.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 2b59352ac616b..266a7ea1435e1 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -219,6 +219,8 @@ in ''; } ]; + environment.etc."dhcpcd.conf".source = dhcpcdConf; + systemd.services.dhcpcd = let cfgN = config.networking; hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "") diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 13fe0bca6bf7c..9d4dc1cd7c2c6 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts ]; - prePatch = '' + postPatch = '' substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell} ''; |