From 3e5e74d5b7f6fcbeff7b6e4e06abd931aab14c48 Mon Sep 17 00:00:00 2001 From: Shawn Landden Date: Mon, 23 Mar 2015 04:44:57 -0700 Subject: [PATCH] timedatectl: fix when queried system has differn't timezone Also allow getting time from time(2) when BUS_TRANSPORT_MACHINE. v2: check for error --- src/timedate/timedatectl.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 9e04f8f7b..44d329ecc 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -106,14 +106,21 @@ static void print_status_info(const StatusInfo *i) { /* Enforce the values of /etc/localtime */ if (getenv("TZ")) { - fprintf(stderr, "Warning: Ignoring the TZ variable. Reading the system's time zone setting only.\n\n"); + fprintf(stderr, "Warning: Ignoring the TZ variable.\n\n"); unsetenv("TZ"); } + r = setenv("TZ", i->timezone, false); + if (r < 0) { + log_error_errno(errno, "Failed to set TZ environment variable: %m"); + exit(EXIT_FAILURE); + } + tzset(); + if (i->time != 0) { sec = (time_t) (i->time / USEC_PER_SEC); have_time = true; - } else if (arg_transport == BUS_TRANSPORT_LOCAL) { + } else if (IN_SET(arg_transport, BUS_TRANSPORT_REMOTE, BUS_TRANSPORT_MACHINE)) { sec = time(NULL); have_time = true; } else -- 2.30.2