summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-11-29 01:06:28 -0800
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-29 13:55:31 -0500
commit778b6a3f8888ec9496143c92c8cbf95f5c891df9 (patch)
tree50a091a911145c19eb4e394a69c8ba29aa71cd6b /src
parenta9edaeff8481573764288ccf7e433a95b6dc7c03 (diff)
systemd-sleep: Support sleep.conf.d directories in the usual search paths
Diffstat (limited to 'src')
-rw-r--r--src/shared/sleep-config.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 0fd307d0b0..ae14c6bd4d 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -48,9 +48,10 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states) {
{}
};
- config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", NULL,
- "Sleep\0",
- config_item_table_lookup, items, false, false, true, NULL);
+ config_parse_many(PKGSYSCONFDIR "/sleep.conf",
+ CONF_DIRS_NULSTR("systemd/sleep.conf"),
+ "Sleep\0", config_item_table_lookup, items,
+ false, NULL);
if (streq(verb, "suspend")) {
/* empty by default */