diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-05-04 12:31:28 -0400 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-05-06 22:51:57 +0200 |
| commit | 19adb8a3204fefd91411b5f0f350c8bc6bcf75fe (patch) | |
| tree | c679e6c127f4efab2dd3ad52b4358884e5c85669 /src/core | |
| parent | b4bc041b1756aab117df40abdcc16a9dc2e72d07 (diff) | |
systemd-sleep: add support for freeze and standby
A new config file /etc/systemd/sleep.conf is added.
It is parsed by systemd-sleep and logind. The strings written
to /sys/power/disk and /sys/power/state can be configured.
This allows people to use different modes of suspend on
systems with broken or special hardware.
Configuration is shared between systemd-sleep and logind
to enable logind to answer the question "can the system be
put to sleep" as correctly as possible without actually
invoking the action. If the user configured systemd-sleep
to only use 'freeze', but current kernel does not support it,
logind will properly report that the system cannot be put
to sleep.
https://bugs.freedesktop.org/show_bug.cgi?id=57793
https://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=7e73c5ae6e7991a6c01f6d096ff8afaef4458c36
http://lists.freedesktop.org/archives/systemd-devel/2013-February/009238.html
SYSTEM_CONFIG_FILE and USER_CONFIG_FILE defines were removed
since they were used in only a few places and with the
addition of /etc/systemd/sleep.conf it becomes easier to just
append the name of each file to the dir name.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/main.c b/src/core/main.c index 22cec4ed15..7fc06bea05 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -668,7 +668,7 @@ static int parse_config_file(void) { const char *fn; int r; - fn = arg_running_as == SYSTEMD_SYSTEM ? SYSTEM_CONFIG_FILE : USER_CONFIG_FILE; + fn = arg_running_as == SYSTEMD_SYSTEM ? PKGSYSCONFDIR "/system.conf" : PKGSYSCONFDIR "/user.conf"; f = fopen(fn, "re"); if (!f) { if (errno == ENOENT) |