diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-07-24 17:08:05 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-07-24 17:29:28 +0200 |
| commit | e070037c8880c5444cdb1dea729285c916b9bb33 (patch) | |
| tree | 601af21573c9b5fc8b35c73b3cd8fe6f0ff804bc /units/systemd-timesyncd.service.in | |
| parent | Merge pull request #13168 from ssahani/fix-dhcp-route-no-parsing (diff) | |
| download | systemd-e070037c8880c5444cdb1dea729285c916b9bb33.tar.xz systemd-e070037c8880c5444cdb1dea729285c916b9bb33.zip | |
Revert "timesyncd: add Conflicts for ntpd and chronyd"
This reverts commit 971a7a1526a6c1d5cb439a8a41dc65ccd4e3a66f.
These unit names are typically different on distributions, let's not
hardcode those. Stuff like this should probably live in the distro
RPM/.deb, but not upstream, where we should be distro agnostic and
agnostic to other higher level packages like this.
Diffstat (limited to 'units/systemd-timesyncd.service.in')
| -rw-r--r-- | units/systemd-timesyncd.service.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in index 2136a85b35..2d8d14f6de 100644 --- a/units/systemd-timesyncd.service.in +++ b/units/systemd-timesyncd.service.in @@ -15,7 +15,6 @@ ConditionVirtualization=!container DefaultDependencies=no After=systemd-remount-fs.service systemd-sysusers.service Before=time-set.target sysinit.target shutdown.target -Conflicts=chronyd.service ntpd.service Conflicts=shutdown.target Wants=time-set.target time-sync.target |