summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2022-11-29 14:20:25 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2022-12-01 13:45:00 +0100
commit074059ab30f261bf91d3717bd9337bc0871871fc (patch)
treed32f5c26abe46c9e6950f62dc5da73adc2cbc856
parentjellyfin: 10.8.7 -> 10.8.8 (diff)
downloadnixpkgs-074059ab30f261bf91d3717bd9337bc0871871fc.tar.gz
nixos: disable systemd-oomd when enableUnifiedCgroupHierarchy is false
Or else systemd-oomd gets marked as failed due to "Userspace Out-Of-Memory (OOM) Killer was skipped because of a failed condition check (ConditionControlGroupController=v2)." and cause the system to enter degraded state. Ref https://github.com/NixOS/nixpkgs/issues/195085 (cherry picked from commit 43ee81aa254ba9cf858643c607735051b8c42a38)
-rw-r--r--nixos/modules/system/boot/systemd.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 8f1086c9c539..e37ed8531810 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -612,6 +612,10 @@ in
boot.kernelParams = optional (!cfg.enableUnifiedCgroupHierarchy) "systemd.unified_cgroup_hierarchy=0";
+ # Avoid potentially degraded system state due to
+ # "Userspace Out-Of-Memory (OOM) Killer was skipped because of a failed condition check (ConditionControlGroupController=v2)."
+ systemd.services.systemd-oomd.enable = mkIf (!cfg.enableUnifiedCgroupHierarchy) false;
+
services.logrotate.settings = {
"/var/log/btmp" = mapAttrs (_: mkDefault) {
frequency = "monthly";