Ubuntu
chrony package

~paelzer/ubuntu/+source/chrony:lp-1872183-timesyncd-conflict-FOCAL

  1. Git
  2. lp:~paelzer/ubuntu/+source/chrony
  3. lp-1872183-timesyncd-conflict-FOCAL
Last commit made on 2020-04-15
Get this branch:
git clone -b lp-1872183-timesyncd-conflict-FOCAL https://git.launchpad.net/~paelzer/ubuntu/+source/chrony
Only Christian Ehrhardt  can upload to this branch. If you are Christian Ehrhardt  please log in for upload directions.

Branch merges

Branch information

Name:
lp-1872183-timesyncd-conflict-FOCAL
Repository:
lp:~paelzer/ubuntu/+source/chrony

Recent commits

cb8c0c4... by Christian Ehrhardt 

changelog: harden time-sources-from-dhcp-servers test for systemd change (LP: #1873031)

Signed-off-by: Christian Ehrhardt <email address hidden>

4b4ef4e... by Christian Ehrhardt 

d/t/control: harden time-sources-from-dhcp-servers test for systemd change (LP: #1873031)

Signed-off-by: Christian Ehrhardt <email address hidden>

a98dc77... by Christian Ehrhardt 

changelog: Stop starting systemd-timesyncd in postrm (LP: #1872183)

Signed-off-by: Christian Ehrhardt <email address hidden>

1b3335e... by Vincent Blut

d/postrm: Stop starting systemd-timesyncd in postrm (Closes: #955773)

c755754... by Christian Ehrhardt 

changelog: avoid multiple time services running concurrently (LP: #1870144)

Signed-off-by: Christian Ehrhardt <email address hidden>

283fe1a... by Christian Ehrhardt 

d/t/upstream-system-tests: fix stderr in case services do not exist

Signed-off-by: Christian Ehrhardt <email address hidden>

c6dcf6d... by Christian Ehrhardt 

d/t/upstream-system-tests: stop chrony/systemd-timesynd before tests

Signed-off-by: Christian Ehrhardt <email address hidden>

321e109... by Christian Ehrhardt 

changelog: fix capsh usage in focal avoiding to always fall back to -x (LP: #1867036)

Signed-off-by: Christian Ehrhardt <email address hidden>

314540e... by Christian Ehrhardt 

- fix capsh usage in focal avoiding to always fall back to -x (LP: #1867036)
  - d/control: add versioned dependency to libcap2-bin new enough to
    support --has-p
  - d/chronyd-starter.sh: update capsh usage to use --has-p

Note: upstream provided in:
https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=588d0439c
Details in:
https://bugs.launchpad.net/ubuntu/+source/chrony/+bug/1867036
Can be suquashed with the following on next merge:
commit 4a434e2d922c9199371b332b0327ccc32b237786
      + debian/chronyd-starter.sh: wrapper to handle special cases in containers
        and if CAP_SYS_TIME is missing. Effectively allows to run NTP server in
        containers on a default installation and avoid failing to sync time (or
        if allowed to sync, avoid multiple containers to fight over it by
        accident).
commit 4a7e5b78461f37df87a709ad05bda48f57675ab0
      + debian/control: add new dependency libcap2-bin for capsh (usually
        installed anyway, but make them explicit to be sure).

--- a/debian/chronyd-starter.sh
+++ b/debian/chronyd-starter.sh
@@ -47,7 +47,7 @@ if [ ${X_SET} -ne 1 ]; then
   HAS_CAP=1
   CAPSH="/sbin/capsh"
   if [ -x "${CAPSH}" ]; then
- ${CAPSH} --print | grep -q "^Current.*${CAP}" || HAS_CAP=0
+ ${CAPSH} --has-p="${CAP}" || HAS_CAP=0
   fi

   if [ ${HAS_CAP} -eq 0 ]; then
diff --git a/debian/control b/debian/control
index 830ff1f7..8f9ec5ce 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: adduser,
          iproute2 [linux-any],
- libcap2-bin,
+ libcap2-bin (>= 1:2.32-1),

Signed-off-by: Christian Ehrhardt <email address hidden>

1acb355... by Christian Ehrhardt 

Import patches-unapplied version 3.5-6ubuntu1 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Upload parent: 3c2d9620ffcb1a89a338ea74b42e7c26cfb98ca9