Unverified Commit bbb93421 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

nixos/tests/chrony: graphene-hardened works without mlock (#423342)

parents e6e45d9a 12d25c49

nixos/modules/services/networking/ntp/chrony.nix

+0 −7
Original line number Diff line number Diff line
@@ -318,13 +318,6 @@ in 
          Alternatively, disable this behaviour by `services.chrony.enableRTCTrimming = false;`

        '';

      }

      {

        assertion = !(cfg.enable && config.environment.memoryAllocator.provider == "graphene-hardened");

        message = ''

          Chrony doesn't work with the graphene-hardened memory allocator set by

          `environment.memoryAllocator.provider`.

        '';

      }

    ];

  };

}

nixos/tests/chrony.nix

+1 −4
Original line number Diff line number Diff line 
{ lib, ... }:

{

  name = "chrony";



  meta.maintainers = with lib.maintainers; [ fpletz ];



  nodes.machine = {

    services.chrony.enable = true;



    specialisation.hardened.configuration = {

      services.chrony.enableMemoryLocking = true;

      environment.memoryAllocator.provider = "graphene-hardened";

    };

  };

pkgs/by-name/ch/chrony/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ stdenv.mkDerivation rec { 
        illumos

      ];

    maintainers = with lib.maintainers; [

      fpletz

      thoughtpolice

      vifino

    ];