From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 11 Oct 2016 13:12:08 +0300 Subject: [PATCH] Change /usr/share/zoneinfo to /etc/zoneinfo NixOS uses this path. --- man/localtime.xml | 4 ++-- src/basic/time-util.c | 8 ++++---- src/firstboot/firstboot.c | 9 +++------ src/nspawn/nspawn.c | 4 ++-- src/timedate/timedated.c | 8 ++++---- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/man/localtime.xml b/man/localtime.xml index 3a13e04a27..4fd58068a1 100644 --- a/man/localtime.xml +++ b/man/localtime.xml @@ -20,7 +20,7 @@ - /etc/localtime -> ../usr/share/zoneinfo/… + /etc/localtime -> zoneinfo/… @@ -30,7 +30,7 @@ system-wide timezone of the local system that is used by applications for presentation to the user. It should be an absolute or relative symbolic link pointing to - /usr/share/zoneinfo/, followed by a timezone + /etc/zoneinfo/, followed by a timezone identifier such as Europe/Berlin or Etc/UTC. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 55931a2546..2e00bd7539 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -1410,7 +1410,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { assert(ret); - f = fopen("/usr/share/zoneinfo/zone1970.tab", "re"); + f = fopen("/etc/zoneinfo/zone1970.tab", "re"); if (!f) return -errno; @@ -1451,7 +1451,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { assert(ret); - f = fopen("/usr/share/zoneinfo/tzdata.zi", "re"); + f = fopen("/etc/zoneinfo/tzdata.zi", "re"); if (!f) return -errno; @@ -1562,7 +1562,7 @@ int verify_timezone(const char *name, int log_level) { if (p - name >= PATH_MAX) return -ENAMETOOLONG; - t = strjoina("/usr/share/zoneinfo/", name); + t = strjoina("/etc/zoneinfo/", name); fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) @@ -1614,7 +1614,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* Return EINVAL if not a symlink */ - const char *e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/"); + const char *e = PATH_STARTSWITH_SET(t, "/etc/zoneinfo/", "../etc/zoneinfo/"); if (!e) return -EINVAL; if (!timezone_is_valid(e, LOG_DEBUG)) diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 5ed6d3a9d2..f922d91a9d 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -618,7 +618,7 @@ static int prompt_timezone(int rfd) { static int process_timezone(int rfd) { _cleanup_close_ int pfd = -EBADF; - _cleanup_free_ char *f = NULL, *relpath = NULL; + _cleanup_free_ char *f = NULL; const char *e; int r; @@ -664,12 +664,9 @@ static int process_timezone(int rfd) { if (isempty(arg_timezone)) return 0; - e = strjoina("/usr/share/zoneinfo/", arg_timezone); - r = path_make_relative_parent(etc_localtime(), e, &relpath); - if (r < 0) - return r; + e = strjoina("zoneinfo/", arg_timezone); - r = symlinkat_atomic_full(relpath, pfd, f, SYMLINK_LABEL); + r = symlinkat_atomic_full(e, pfd, f, SYMLINK_LABEL); if (r < 0) return log_error_errno(r, "Failed to create /etc/localtime symlink: %m"); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 480a9c55c6..02c9ae6608 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1821,8 +1821,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, - "../usr/share/zoneinfo/", - "/usr/share/zoneinfo/"); + "../etc/zoneinfo/", + "/etc/zoneinfo/"); } static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 57f3413dc6..6a456fe601 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -266,7 +266,7 @@ static int context_read_data(Context *c) { r = get_timezone(&t); if (r == -EINVAL) - log_warning_errno(r, "/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/."); + log_warning_errno(r, "/etc/localtime should be a symbolic link to a time zone data file in /etc/zoneinfo/."); else if (r < 0) log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); @@ -290,7 +290,7 @@ static int context_write_data_timezone(Context *c) { if (isempty(c->zone) || streq(c->zone, "UTC")) { - if (access("/usr/share/zoneinfo/UTC", F_OK) < 0) { + if (access("/etc/zoneinfo/UTC", F_OK) < 0) { if (unlink(etc_localtime()) < 0 && errno != ENOENT) return -errno; @@ -298,9 +298,9 @@ static int context_write_data_timezone(Context *c) { return 0; } - source = "/usr/share/zoneinfo/UTC"; + source = "/etc/zoneinfo/UTC"; } else { - p = path_join("/usr/share/zoneinfo", c->zone); + p = path_join("/etc/zoneinfo", c->zone); if (!p) return -ENOMEM;