openkylin
/
systemd
mirror of https://gitee.com/openkylin/systemd.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix retrieving timezone on read-only /etc 

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

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.

[ratchanan@ubports.com: add descrtiption and other metadata.]

This patch can be dropped once LP: #1953172 got resolved
Last-Update: 2021-09-24
Gbp-Pq: Topic debian
Gbp-Pq: Name timedatectl-lp1650688.patch
This commit is contained in:
Michael Vogt 2023-04-12 17:15:01 +08:00 committed by liaoxianfu
parent db8013a71f
commit 088a2c6e1e
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/basic/time-util.c
View File

@ -1472,6 +1472,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;
@ -1479,7 +1498,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;