27 lines
868 B
Diff
27 lines
868 B
Diff
|
From: Frederic Crozat <fcrozat@suse.com>
|
||
|
|
Date: Tue, 14 Aug 2012 14:26:16 +0200
|
||
|
|
Subject: timedate: add support for openSUSE version of /etc/sysconfig/clock
|
||
|
|
|
||
|
|
---
|
||
|
|
src/timedate/timedated.c | 7 +++++++
|
||
|
|
1 file changed, 7 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
|
||
|
|
index 16fffd0..b1b1859 100644
|
||
|
|
--- a/src/timedate/timedated.c
|
||
|
|
+++ b/src/timedate/timedated.c
|
||
|
|
@@ -180,6 +180,13 @@ static int read_data(void) {
|
||
|
|
goto have_timezone;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+#ifdef HAVE_SYSV_COMPAT
|
||
|
|
+ r = parse_env_file("/etc/sysconfig/clock", NEWLINE,
|
||
|
|
+ "TIMEZONE", &tz.zone,
|
||
|
|
+ NULL);
|
||
|
|
+ if (r < 0 && r != -ENOENT)
|
||
|
|
+ log_warning("Failed to read /etc/sysconfig/clock: %s", strerror(-r));
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
have_timezone:
|
||
|
|
if (isempty(tz.zone)) {
|