Merge ~paelzer/ubuntu/+source/chrony:bionic-lp1761327 into ubuntu/+source/chrony:ubuntu/devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Working fine, can be reviewed without ppa as it is a config change only.
My checks are good on this.

@Josh I added you as reviewer since you have the env ready to confirm.

[Joshua Powers (powersj)]

LGTM confirmed that is how I fixed it locally.

Thanks!

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the cross check.
Also Debian already picked (actually developed on the same day) the change.
So this will be no long term maintenance burden.

Tag pushed and package uploaded.

diff --git a/debian/changelog b/debian/changelog
index 28eb2d3..773796a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chrony (3.2-4ubuntu3) bionic; urgency=medium
+
+  * debian/usr.sbin.chronyd: add cap net_admin for hwtimestamp (LP: #1761327)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 05 Apr 2018 09:38:10 +0200
+
 chrony (3.2-4ubuntu2) bionic; urgency=medium
 
   * Set -x as default if unable to set time (e.g. in containers) (LP: #1589780)
diff --git a/debian/usr.sbin.chronyd b/debian/usr.sbin.chronyd
index 7a6b53b..92f77a5 100644
--- a/debian/usr.sbin.chronyd
+++ b/debian/usr.sbin.chronyd
@@ -14,6 +14,8 @@
   capability sys_resource,
   # for /run/chrony to be created
   capability chown,
+  # for hwtimestamp
+  capability net_admin,
 
   /usr/sbin/chronyd mr,