about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-07-11 16:10:20 +0200
committerGitHub <noreply@github.com>2016-07-11 16:10:20 +0200
commit44789200f053c3482ef6a19fd76e638996f33031 (patch)
tree8e7c4f49dc6f48ffeec8088bfac3a0b95c648a38
parentecc26d7a40747204ec0be45c6e051bfef605333c (diff)
parentb187c869f4cf3d8daf052a8d21207a806638ddc4 (diff)
downloadnixlib-44789200f053c3482ef6a19fd76e638996f33031.tar
nixlib-44789200f053c3482ef6a19fd76e638996f33031.tar.gz
nixlib-44789200f053c3482ef6a19fd76e638996f33031.tar.bz2
nixlib-44789200f053c3482ef6a19fd76e638996f33031.tar.lz
nixlib-44789200f053c3482ef6a19fd76e638996f33031.tar.xz
nixlib-44789200f053c3482ef6a19fd76e638996f33031.tar.zst
nixlib-44789200f053c3482ef6a19fd76e638996f33031.zip
Merge pull request #16835 from Jookia/RFC_coredump
systemd-coredump: Add systemd service and fix sysctl pattern.
-rw-r--r--nixos/modules/system/boot/coredump.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/coredump.nix b/nixos/modules/system/boot/coredump.nix
index 793c7515c761..b27a35b6257d 100644
--- a/nixos/modules/system/boot/coredump.nix
+++ b/nixos/modules/system/boot/coredump.nix
@@ -36,6 +36,8 @@ with lib;
   config = mkMerge [
     (mkIf config.systemd.coredump.enable {
 
+      systemd.additionalUpstreamSystemUnits = [ "systemd-coredump.socket" "systemd-coredump@.service" ];
+
       environment.etc."systemd/coredump.conf".text =
         ''
           [Coredump]
@@ -45,7 +47,7 @@ with lib;
       # Have the kernel pass core dumps to systemd's coredump helper binary.
       # From systemd's 50-coredump.conf file. See:
       # <https://github.com/systemd/systemd/blob/v218/sysctl.d/50-coredump.conf.in>
-      boot.kernel.sysctl."kernel.core_pattern" = "|${pkgs.systemd}/lib/systemd/systemd-coredump %p %u %g %s %t %e";
+      boot.kernel.sysctl."kernel.core_pattern" = "|${pkgs.systemd}/lib/systemd/systemd-coredump %P %u %g %s %t %c %e";
     })
 
     (mkIf (!config.systemd.coredump.enable) {