merge 1:4.2.8p12+dfsg-3
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
ntp (Ubuntu) |
Fix Released
|
Undecided
|
Christian Ehrhardt |
Bug Description
This merge is a a bit more special than usual.
NTP is no more in Main since 18.04 and also gladly the issues with it dropped to almost none (by not being used). Chrony (its replacement) OTOH has way less issues and also is easier to support upstream.
We have upstreamed or debianized most of our changes, but on this merge want to -intentionally- drop some delta that is not.
We have three main delta elements left:
a) set ubuntu time servers
b) some tweaks on pps documentaiton
c) dhclient integration to read systemd-leasefile
Of these:
a) we want to keep just this as only there we can guarantee the servers are working
b) we want to drop as it just isn't important to adapt that on merges (people should use chrony/gpsd for that anyway)
c) we want to avoid the maintenance of this on a non main package. Therefore keep this as-is as long as it merges easily, but in case of any trouble drop it.
Related branches
- Andreas Hasenack: Approve
- Canonical Server: Pending requested
- git-ubuntu developers: Pending requested
-
Diff: 1648 lines (+1363/-18)8 files modifieddebian/changelog (+1327/-0)
debian/control (+2/-1)
debian/ntp-systemd-netif.path (+8/-0)
debian/ntp-systemd-netif.service (+4/-0)
debian/ntp.conf (+12/-12)
debian/ntp.dhcp (+6/-4)
debian/ntpdate.default (+1/-1)
debian/rules (+3/-0)
Changed in ntp (Ubuntu): | |
status: | Triaged → In Progress |
assignee: | nobody → Christian Ehrhardt (paelzer) |
I passed once over the open recent NTP bugs before this merge, we really don't have anything big left - I'm glad that chrony seems to have took over this smoothly.
Note: so far the dhclient delta (c) applies cleanly, so keeping it