diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-02-02 09:10:41 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 10:23:13 +0100 |
| commit | 5b3e932f4e40d2c5523757242e00e4f4e6ae89cd (patch) | |
| tree | d05f7e31018dafe4e70bae4ae480d7c1683b9908 /Makefile.am | |
| parent | e19b8719a54c343372e16b462c27f1e84c987b85 (diff) | |
Incorporate sleep.conf into logind.conf
* src/login/logind-action.c (shutdown_or_sleep, do_sleep): Take modes
from the manager instead of parsing them ourselves.
* src/login/logind-dbus.c (execute_shutdown_or_sleep): Adapt to
shutdown_or_sleep prototype change.
* src/login/logind-gperf.gperf: Add config items from sleep.conf.
* src/login/logind.c (manager_new): Wire up defaults for new config
items.
(manager_free): Free new config items.
(manager_parse_config_file): Arrange to parse a single
elogind/logind.conf file, not grovelling all over the filesystem.
Take the file from the ELOGIND_CONF_FILE environment variable if
present.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 6e8805898..9800c47f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -730,7 +730,7 @@ dist_dbuspolicy_DATA += \ src/login/org.freedesktop.login1.conf dist_pkgsysconf_DATA += \ - src/login/elogind.conf + src/login/logind.conf polkitpolicy_files += \ src/login/org.freedesktop.login1.policy @@ -791,9 +791,6 @@ sysctl.d/%: sysctl.d/%.in %.pc: %.pc.in $(SED_PROCESS) -%.conf: %.conf.in - $(SED_PROCESS) - shell-completion/%: shell-completion/%.in $(SED_PROCESS) |