system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-20 08:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

timedatectl: fix when queried system has differn't timezone

Browse source 
Also allow getting time from time(2) when BUS_TRANSPORT_MACHINE.

v2: check for error
This commit is contained in:
Shawn Landden 2015-03-23 04:44:57 -07:00 committed by Kay Sievers
parent c03d5c8e76
commit 3e5e74d5b7
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/timedate/timedatectl.c
View file

@ -106,14 +106,21 @@ static void print_status_info(const StatusInfo *i) {
/* Enforce the values of /etc/localtime */ /* Enforce the values of /etc/localtime */
if (getenv("TZ")) { 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"); 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) { if (i->time != 0) {
sec = (time_t) (i->time / USEC_PER_SEC); sec = (time_t) (i->time / USEC_PER_SEC);
have_time = true; 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); sec = time(NULL);
have_time = true; have_time = true;
} else } else