From aab69d7f19b3caf747c2ee3d8a32effae05a795c Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Thu, 9 Jan 2025 20:17:01 +0100 Subject: [PATCH] nixos/systemd: include sshd in PATH if openssh is enabled This enables systemd-ssh-generator to find the sshd binary. --- nixos/modules/system/boot/systemd.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 7ae06b509a50..e80164da2b11 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -628,7 +628,12 @@ in systemd.managerEnvironment = { # Doesn't contain systemd itself - everything works so it seems to use the compiled-in value for its tools # util-linux is needed for the main fsck utility wrapping the fs-specific ones - PATH = lib.makeBinPath (config.system.fsPackages ++ [cfg.package.util-linux]); + PATH = lib.makeBinPath ( + config.system.fsPackages + ++ [cfg.package.util-linux] + # systemd-ssh-generator needs sshd in PATH + ++ lib.optional config.services.openssh.enable config.services.openssh.package + ); LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; TZDIR = "/etc/zoneinfo"; # If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable