Unverified Commit 2a278943 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #220232 from aanderse/nixos/systemd-oomd

nixos/systemd-oomd: avoid unintentionally creating the systemd-oomd u…
parents 42683dbd 374fc068
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ in

    # 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;
    systemd.oomd.enable = mkIf (!cfg.enableUnifiedCgroupHierarchy) false;

    services.logrotate.settings = {
      "/var/log/btmp" = mapAttrs (_: mkDefault) {