Merge ~peat-new/ubuntu/+source/systemd:ubuntu-impish_-_timedated-symlink into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-impish

[Ratchanan Srirattanamet]

Fix timedated unable to retrieve & properly set timezone on read-only /etc

LP: #1650688
LP: #1733881

Unmerged commits

bc88e0f... by Ratchanan Srirattanamet on 2021-09-24

Fix timedated unable to retrieve & properly set timezone on read-only /etc

LP: #1650688
LP: #1733881

diff --git a/debian/changelog b/debian/changelog
index ec86551..a8264dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,13 @@ systemd (248.3-1ubuntu8) UNRELEASED; urgency=medium
     - debian/patches/lp1942113.patch
     - debian/patches/Merge-pull-request-20705-from-yuwata-test-oomd-util.patch
 
+  [ Ratchanan Srirattanamet ]
+  * d/p/debian/timedatectl-lp1650688.patch,
+    d/p/debian/UBUNTU-Fix-timezone-setting-on-read-only-etc.patch:
+    Fix timedated unable to retrieve & properly set timezone on
+    read-only /etc (e.g. Ubuntu Core and system-image-based systems)
+    (LP: #1650688, LP: #1733881)
+
  -- Lukas Märdian <[e-mail]>  Mon, 13 Sep 2021 12:59:26 +0200
 
 systemd (248.3-1ubuntu7) impish; urgency=medium
diff --git a/debian/patches/debian/UBUNTU-Fix-timezone-setting-on-read-only-etc.patch b/debian/patches/debian/UBUNTU-Fix-timezone-setting-on-read-only-etc.patch
 new file mode 100644
index 0000000..dccf2e0
--- /dev/null
+++ b/debian/patches/debian/UBUNTU-Fix-timezone-setting-on-read-only-etc.patch
@@ -0,0 +1,28 @@
+Description: Fix timezone setting on read-only etc
+ Due to our read-only /etc workaround, the localtime link on such
+ system ends up in /etc/writable, not /etc. To make the link target
+ correct in both normal and such systems, makes the path absolute.
+ .
+ On Ubuntu Core, this eliminates the need for the wrapper script, and
+ makes the DBus interface work properly.
+Author: Ratchanan Srirattanamet <[e-mail]>
+Origin: other
+Bug-Ubuntu: https://bugs.launchpad.net/snappy/+bug/1650688
+Forwarded: not-needed (part of read-only /etc workaround)
+Last-Update: 2021-09-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/timedate/timedated.c
++++ b/src/timedate/timedated.c
+@@ -320,9 +320,9 @@
+                         return r;
+                 }
+ 
+-                source = "../usr/share/zoneinfo/UTC";
++                source = "/usr/share/zoneinfo/UTC";
+         } else {
+-                p = path_join("../usr/share/zoneinfo", c->zone);
++                p = path_join("/usr/share/zoneinfo", c->zone);
+                 if (!p)
+                         return -ENOMEM;
+ 
diff --git a/debian/patches/debian/timedatectl-lp1650688.patch b/debian/patches/debian/timedatectl-lp1650688.patch
 new file mode 100644
index 0000000..35bc48c
--- /dev/null
+++ b/debian/patches/debian/timedatectl-lp1650688.patch
@@ -0,0 +1,53 @@
+Description: Fix retrieving timezone on read-only /etc
+ get_timezone() retrieve it by reading the link destination of
+ /etc/localtime, which on systems with read-only /etc will always point
+ to /etc/writable. Makes this function aware of the /etc/writable
+ redirection and handle it.
+ .
+ [[e-mail]: add descrtiption and other metadata.]
+Author: Michael Vogt <[e-mail]>
+Origin: vendor, https://bugs.launchpad.net/snappy/+bug/1650688/comments/46
+Bug-Ubuntu: https://bugs.launchpad.net/snappy/+bug/1650688
+Forwarded: not-needed (part of read-only /etc workaround)
+Last-Update: 2021-09-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/src/basic/time-util.c b/src/basic/time-util.c
+index d7028ac..b9bb4da 100644
+--- a/src/basic/time-util.c
++++ b/src/basic/time-util.c
+@@ -1391,6 +1391,25 @@ bool clock_supported(clockid_t clock) {
+         }
+ }
+ 
++/* Hack for Ubuntu phone: check if path is an existing symlink to
++ * /etc/writable; if it is, update that instead */
++static const char* writable_filename(const char *path) {
++        ssize_t r;
++        static char realfile_buf[PATH_MAX];
++        _cleanup_free_ char *realfile = NULL;
++        const char *result = path;
++        int orig_errno = errno;
++
++        r = readlink_and_make_absolute(path, &realfile);
++        if (r >= 0 && startswith(realfile, "/etc/writable")) {
++                snprintf(realfile_buf, sizeof(realfile_buf), "%s", realfile);
++                result = realfile_buf;
++        }
++
++        errno = orig_errno;
++        return result;
++}
++
+ int get_timezone(char **ret) {
+         _cleanup_free_ char *t = NULL;
+         const char *e;
+@@ -1398,7 +1417,7 @@ int get_timezone(char **ret) {
+         int r;
+         bool use_utc_fallback = false;
+ 
+-        r = readlink_malloc("/etc/localtime", &t);
++        r = readlink_malloc(writable_filename("/etc/localtime"), &t);
+         if (r < 0) {
+                 if (r == -ENOENT)
+                         use_utc_fallback = true;
diff --git a/debian/patches/series b/debian/patches/series
index 9619486..844b76f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,6 +34,8 @@ debian/UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch
 debian/UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch
 debian/UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch
 debian/UBUNTU-Support-system-image-read-only-etc.patch
+debian/timedatectl-lp1650688.patch
+debian/UBUNTU-Fix-timezone-setting-on-read-only-etc.patch
 debian/UBUNTU-units-disable-journald-watchdog.patch
 debian/UBUNTU-Revert-namespace-be-more-careful-when-handling-namespacin.patch
 debian/UBUNTU-Revert-cgroup-Continue-unit-reset-if-cgroup-is-busy.patch