forked from pool/systemd
c446b5bdf8
- Enable Predictable Network interface names (bnc#829526). - version 207, distribution specific changes follow, for overall release notes see NEWS. - Fixed: * Failed at step PAM spawning /usr/lib/systemd/systemd: Operation not permitted * Fix shutdown hang "a stop job is running for Session 1 of user root" that was reported in opensuse-factory list. - systemd-sysctl no longer reads /etc/sysctl.conf however backward compatbility is to be provides by a symlink created at %post. - removed previously disabled upstream patches (merged): 0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch, 0004-disable-the-cgroups-release-agent-when-shutting-down.patch, 0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch, 0006-suppress-status-message-output-at-shutdown-when-quie.patch, - removed upstream merged patches: exclude-dev-from-tmpfiles.patch, logind_update_state_file_after_generating_....patch - Add systemd-pam_config.patch: use correct include name for PAM configuration on openSUSE. - Add exclude-dev-from-tmpfiles.patch: allow to exclude /dev from tmpfiles (bnc#835813). OBS-URL: https://build.opensuse.org/request/show/198848 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=155
25 lines
830 B
Diff
25 lines
830 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(+)
|
|
|
|
--- systemd-206_git201308300826.orig/src/timedate/timedated.c
|
|
+++ systemd-206_git201308300826/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)) {
|