Skip to content
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
base: 4c4e26b6aa20
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f115a926496b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 22, 2018

  1. chrony: disable the whole timesyncd module when chronyd is enabled 

    Peviously only the timesyncd systemd unit was disabled. This meant
that when you activate a system that has chronyd enabled the following
strange startup behaviour takes place:

  systemd[1]: Starting chrony NTP daemon...
  systemd[1]: Stopping Network Time Synchronization...
  systemd[1]: Stopped chrony NTP daemon.
  systemd[1]: Starting Network Time Synchronization...

(cherry picked from commit 56ef106)
    @basvandijk
    basvandijk committed Jun 22, 2018
    Copy the full SHA
    942097d View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2018

  1. Merge pull request #42366 from LumiGuide/fix-chronyd-release-18.03 

    chrony: disable the whole timesyncd module when chronyd is enabled (cherry-pick on release-18.03)
    @xeji
    xeji committed Jun 24, 2018
    Copy the full SHA
    f115a92 View commit details
    Browse the repository at this point in the history