diff options
author | Florian Klink <flokli@flokli.de> | 2019-08-16 11:29:41 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2019-08-18 17:54:26 +0200 |
commit | bafc25691596caf2f6e034cbe5933fdd90a92b6a (patch) | |
tree | 237905e1656d9ff95896afd78579677dadd9ce71 /nixos/modules/system | |
parent | 9be0327a4975e219957d5108b3753a7640c4a9e0 (diff) | |
download | nixlib-bafc25691596caf2f6e034cbe5933fdd90a92b6a.tar nixlib-bafc25691596caf2f6e034cbe5933fdd90a92b6a.tar.gz nixlib-bafc25691596caf2f6e034cbe5933fdd90a92b6a.tar.bz2 nixlib-bafc25691596caf2f6e034cbe5933fdd90a92b6a.tar.lz nixlib-bafc25691596caf2f6e034cbe5933fdd90a92b6a.tar.xz nixlib-bafc25691596caf2f6e034cbe5933fdd90a92b6a.tar.zst nixlib-bafc25691596caf2f6e034cbe5933fdd90a92b6a.zip |
nixos/systemd: remove separate coredump module
Diffstat (limited to 'nixos/modules/system')
-rw-r--r-- | nixos/modules/system/boot/coredump.nix | 66 | ||||
-rw-r--r-- | nixos/modules/system/boot/systemd.nix | 21 |
2 files changed, 21 insertions, 66 deletions
diff --git a/nixos/modules/system/boot/coredump.nix b/nixos/modules/system/boot/coredump.nix deleted file mode 100644 index 30f367da7666..000000000000 --- a/nixos/modules/system/boot/coredump.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ - - options = { - - systemd.coredump = { - - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enables storing core dumps in systemd. - Note that this alone is not enough to enable core dumps. The maximum - file size for core dumps must be specified in limits.conf as well. See - <option>security.pam.loginLimits</option> and the limits.conf(5) - man page (these specify the core dump limits for user login sessions) - and <option>systemd.extraConfig</option> (where e.g. - <literal>DefaultLimitCORE=1000000</literal> can be specified to set - the core dump limit for systemd system-level services). - ''; - }; - - extraConfig = mkOption { - default = ""; - type = types.lines; - example = "Storage=journal"; - description = '' - Extra config options for systemd-coredump. See coredump.conf(5) man page - for available options. - ''; - }; - }; - - }; - - config = mkMerge [ - (mkIf config.systemd.coredump.enable { - - systemd.additionalUpstreamSystemUnits = [ "systemd-coredump.socket" "systemd-coredump@.service" ]; - - environment.etc."systemd/coredump.conf".text = - '' - [Coredump] - ${config.systemd.coredump.extraConfig} - ''; - - # 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 %c %e"; - }) - - (mkIf (!config.systemd.coredump.enable) { - boot.kernel.sysctl."kernel.core_pattern" = mkDefault "core"; - - systemd.extraConfig = - '' - DefaultLimitCORE=0:infinity - ''; - }) - ]; - -} diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index e84b1ffbfc14..23a2dd45d492 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -76,6 +76,10 @@ let "systemd-journald-dev-log.socket" "syslog.socket" + # Coredumps. + "systemd-coredump.socket" + "systemd-coredump@.service" + # SysV init compatibility. "systemd-initctl.socket" "systemd-initctl.service" @@ -540,6 +544,16 @@ in ''; }; + systemd.coredump.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "Storage=journal"; + description = '' + Extra config options for systemd-coredump. See coredump.conf(5) man page + for available options. + ''; + }; + systemd.extraConfig = mkOption { default = ""; type = types.lines; @@ -795,6 +809,7 @@ in DefaultMemoryAccounting=yes DefaultTasksAccounting=yes ''} + DefaultLimitCORE=infinity ${config.systemd.extraConfig} ''; @@ -818,6 +833,12 @@ in ${config.services.journald.extraConfig} ''; + "systemd/coredump.conf".text = + '' + [Coredump] + ${config.systemd.coredump.extraConfig} + ''; + "systemd/logind.conf".text = '' [Login] KillUserProcesses=${if config.services.logind.killUserProcesses then "yes" else "no"} |