forked from pool/systemd
a699b1ca34
- Do not provide %{release} for systemd-analyze
- Add more conflicts to -mini packages
- Disable Predictable Network interface names until it has been
reviewed by network team, with /usr/lib/tmpfiles.d/network.conf.
- Don't package /usr/lib/firmware/update (not used) (forwarded request 172848 from fcrozat)
OBS-URL: https://build.opensuse.org/request/show/172873
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=135
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 cdb6e5b..7246452 100644
|
|
--- a/src/timedate/timedated.c
|
|
+++ b/src/timedate/timedated.c
|
|
@@ -182,6 +182,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)) {
|