mirror of
https://github.com/systemd/systemd
synced 2024-10-15 12:34:37 +00:00
Revert "timesyncd: add Conflicts for ntpd and chronyd"
This reverts commit 971a7a1526
.
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.
This commit is contained in:
parent
372901d071
commit
e070037c88
|
@ -15,7 +15,6 @@ ConditionVirtualization=!container
|
||||||
DefaultDependencies=no
|
DefaultDependencies=no
|
||||||
After=systemd-remount-fs.service systemd-sysusers.service
|
After=systemd-remount-fs.service systemd-sysusers.service
|
||||||
Before=time-set.target sysinit.target shutdown.target
|
Before=time-set.target sysinit.target shutdown.target
|
||||||
Conflicts=chronyd.service ntpd.service
|
|
||||||
Conflicts=shutdown.target
|
Conflicts=shutdown.target
|
||||||
Wants=time-set.target time-sync.target
|
Wants=time-set.target time-sync.target
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue