1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00

timedate: fall back to /etc/sysconfig/clock on Fedora, for compatibility with legacy

This commit is contained in:
Lennart Poettering 2011-10-11 04:23:35 +02:00
parent 8266f984df
commit a724d2ed79
2 changed files with 19 additions and 7 deletions

6
TODO
View File

@ -17,21 +17,17 @@ Bugfixes:
* make polkit checks async
* logind is leaking fifos?
* fail gracefully if logind reaches it RLIMIT_NFILES for fifos
Features:
* ConditionCapability=
* order network mounts after network-fs-ready.target or so
* read fedora style timezone name config for compat
* if we can not get user quota for tmpfs, mount a separate tmpfs instance
for every user in /run/user/$USER with a configured maximum size
* bind mounts should be ordered after remount-root-fs.service
* default to actual 32bit PIDs, via /proc/sys/kernel/pid_max
* increase RLIMIT_NOFILE for logind, logger by default

View File

@ -170,8 +170,24 @@ static int read_data(void) {
free_data();
r = read_one_line_file("/etc/timezone", &zone);
if (r < 0 && r != -ENOENT)
return r;
if (r < 0) {
if (r != -ENOENT)
log_warning("Failed to read /etc/timezone: %s", strerror(-r));
#ifdef TARGET_FEDORA
r = parse_env_file("/etc/sysconfig/clock", NEWLINE,
"ZONE", &zone,
NULL);
if (r < 0 && r != -ENOENT)
log_warning("Failed to read /etc/sysconfig/clock: %s", strerror(-r));
#endif
}
if (isempty(zone)) {
free(zone);
zone = NULL;
}
verify_timezone();