From 002b6f84a6ccdce80e013d3d8e0f27926ae574af Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 20 Jun 2023 20:39:52 +0200 Subject: systemd: fix services not stopping Fixes #237591 --- pkgs/os-specific/linux/systemd/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs/os-specific/linux/systemd/default.nix') diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fd5ca2df5a9..ab64c9f9c48 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -190,6 +190,13 @@ stdenv.mkDerivation (finalAttrs: { ./0017-core-don-t-taint-on-unmerged-usr.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch ./0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch + + # https://github.com/systemd/systemd/pull/28000 + (fetchpatch { + name = "fix-service-exit"; + url = "https://github.com/systemd/systemd/commit/5f7f82ba625ee48d662c1f0286f44b8b0918d05d.patch"; + sha256 = "sha256-pFRXpZjeVl5ZG/mOjHEuMg9zXq4Orwvdp+/LYTbR09I="; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { -- cgit 1.4.1