6dd417b710
- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) OBS-URL: https://build.opensuse.org/request/show/139993 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=111
29 lines
1.0 KiB
Diff
29 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(-)
|
|
|
|
Index: systemd-190/src/timedate/timedated.c
|
|
===================================================================
|
|
--- systemd-190.orig/src/timedate/timedated.c
|
|
+++ systemd-190/src/timedate/timedated.c
|
|
@@ -175,6 +175,13 @@ static int read_data(void) {
|
|
goto have_timezone;
|
|
}
|
|
}
|
|
+#ifdef TARGET_SUSE
|
|
+ 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
|
|
|
|
#ifdef HAVE_DEBIAN
|
|
r = read_one_line_file("/etc/timezone", &tz.zone);
|