Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 58f61cfcddc1
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 173852b9362b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 3, 2018

  1. nixos/chrony: fix misplaced ConditionCapability= directive 

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 4594b18)
    @thoughtpolice
    thoughtpolice committed Dec 3, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    sxzz Kevin Deng 三咲智子
    SSH Key Fingerprint: I0/gY8Rb7HnU56beA4F5l8qYUOR7E5wLLU6ZF7o6nLQ
    Verified
    Learn about vigilant mode
    Copy the full SHA
    173852b View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 nixos/modules/services/networking/chrony.nix
3 changes: 2 additions & 1 deletion nixos/modules/services/networking/chrony.nix
View file
Original file line number Diff line number Diff line change
@@ -111,6 +111,7 @@ in
chown chrony:chrony ${stateDir} ${keyFile}
'';

unitConfig.ConditionCapability = "CAP_SYS_TIME";
serviceConfig =
{ Type = "forking";
ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
@@ -119,8 +120,8 @@ in
ProtectSystem = "full";
PrivateTmp = "yes";

ConditionCapability = "CAP_SYS_TIME";
};

};
};
}