diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-27 16:36:47 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-27 16:36:47 +0200 |
| commit | 98640fd48212f8e6552517f667bba1901f5936d4 (patch) | |
| tree | 0b5f895f31f16b47e8f837c1d3ac87da1f2884eb /nixos/modules/system | |
| parent | 70c1c856d4c96fb37b6e507db4acb125656f992d (diff) | |
| parent | b40ee8268515d78b419f53fb22a9fad49b985de8 (diff) | |
| download | nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.gz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.bz2 nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.lz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.xz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.zst nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 23a2dd45d49..2a0360b12cb 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -537,7 +537,7 @@ in }; systemd.enableCgroupAccounting = mkOption { - default = false; + default = true; type = types.bool; description = '' Whether to enable cgroup accounting. @@ -804,10 +804,10 @@ in [Manager] ${optionalString config.systemd.enableCgroupAccounting '' DefaultCPUAccounting=yes + DefaultBlockIOAccounting=yes DefaultIOAccounting=yes DefaultBlockIOAccounting=yes - DefaultMemoryAccounting=yes - DefaultTasksAccounting=yes + DefaultIPAccounting=yes ''} DefaultLimitCORE=infinity ${config.systemd.extraConfig} |