forked from pool/systemd
33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
|
From 64ddc0bfa995041196fd0b9c61756d64578f925c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
||
|
|
Date: Tue, 14 Aug 2012 14:26:16 +0200
|
||
|
|
Subject: [PATCH] timedate: add support for openSUSE version of
|
||
|
|
/etc/sysconfig/clock
|
||
|
|
|
||
|
|
---
|
||
|
|
src/timedate/timedated.c | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
|
||
|
|
index 6a7d980..fbebc1d 100644
|
||
|
|
--- a/src/timedate/timedated.c
|
||
|
|
+++ b/src/timedate/timedated.c
|
||
|
|
@@ -180,9 +180,13 @@ static int read_data(void) {
|
||
|
|
if (r != -ENOENT)
|
||
|
|
log_warning("Failed to read /etc/timezone: %s", strerror(-r));
|
||
|
|
|
||
|
|
-#ifdef TARGET_FEDORA
|
||
|
|
+#if defined(TARGET_FEDORA) || defined(TARGET_SUSE)
|
||
|
|
r = parse_env_file("/etc/sysconfig/clock", NEWLINE,
|
||
|
|
+#ifdef TARGET_FEDORA
|
||
|
|
"ZONE", &tz.zone,
|
||
|
|
+#else /* TARGET_SUSE */
|
||
|
|
+ "TIMEZONE", &tz.zone,
|
||
|
|
+#endif
|
||
|
|
NULL);
|
||
|
|
|
||
|
|
if (r < 0 && r != -ENOENT)
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|