diff options
| -rw-r--r-- | Makefile-man.am | 5 | ||||
| -rw-r--r-- | man/systemd-sleep.conf.xml | 15 | ||||
| -rw-r--r-- | man/systemd-suspend.service.xml | 3 | ||||
| -rw-r--r-- | src/shared/sleep-config.c | 7 |
4 files changed, 23 insertions, 7 deletions
diff --git a/Makefile-man.am b/Makefile-man.am index e0c15fa397..2a0d73e05c 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -196,6 +196,7 @@ MANPAGES_ALIAS += \ man/sd_journal_wait.3 \ man/sd_machine_get_ifindices.3 \ man/sd_notifyf.3 \ + man/sleep.conf.d.5 \ man/system.conf.d.5 \ man/systemd-ask-password-console.path.8 \ man/systemd-ask-password-wall.path.8 \ @@ -305,6 +306,7 @@ man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3 man/sd_journal_wait.3: man/sd_journal_get_fd.3 man/sd_machine_get_ifindices.3: man/sd_machine_get_class.3 man/sd_notifyf.3: man/sd_notify.3 +man/sleep.conf.d.5: man/systemd-sleep.conf.5 man/system.conf.d.5: man/systemd-system.conf.5 man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8 man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8 @@ -562,6 +564,9 @@ man/sd_machine_get_ifindices.html: man/sd_machine_get_class.html man/sd_notifyf.html: man/sd_notify.html $(html-alias) +man/sleep.conf.d.html: man/systemd-sleep.conf.html + $(html-alias) + man/system.conf.d.html: man/systemd-system.conf.html $(html-alias) diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml index d724960678..99e0e3315f 100644 --- a/man/systemd-sleep.conf.xml +++ b/man/systemd-sleep.conf.xml @@ -22,7 +22,8 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="systemd-sleep.conf"> +<refentry id="systemd-sleep.conf" + xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>systemd-sleep.conf</title> <productname>systemd</productname> @@ -44,11 +45,15 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <refnamediv> <refname>systemd-sleep.conf</refname> + <refname>sleep.conf.d</refname> <refpurpose>Suspend and hibernation configuration file</refpurpose> </refnamediv> <refsynopsisdiv> <para><filename>/etc/systemd/sleep.conf</filename></para> + <para><filename>/etc/systemd/sleep.conf.d/*.conf</filename></para> + <para><filename>/run/systemd/sleep.conf.d/*.conf</filename></para> + <para><filename>/usr/lib/systemd/sleep.conf.d/*.conf</filename></para> </refsynopsisdiv> <refsect1> @@ -98,7 +103,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. </varlistentry> </variablelist> - <para>Settings in this file determine what strings + <para>Settings in these files determine what strings will be written to <filename>/sys/power/disk</filename> and <filename>/sys/power/state</filename> by @@ -108,12 +113,16 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. attempts to suspend or hibernate the machine.</para> </refsect1> + <xi:include href="standard-conf.xml" xpointer="confd" /> + <xi:include href="standard-conf.xml" xpointer="conf" /> + <refsect1> <title>Options</title> <para>The following options can be configured in the <literal>[Sleep]</literal> section of - <filename>/etc/systemd/sleep.conf</filename>:</para> + <filename>/etc/systemd/sleep.conf</filename> or a + <filename>sleep.conf.d</filename> file:</para> <variablelist class='systemd-directives'> <varlistentry> diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml index 9a3ae1b89e..375c25576d 100644 --- a/man/systemd-suspend.service.xml +++ b/man/systemd-suspend.service.xml @@ -114,7 +114,8 @@ <filename>/sys/power/state</filename>, to trigger the actual system suspend. What exactly is written where can be configured in the <literal>[Sleep]</literal> - section of <filename>/etc/systemd/sleep.conf</filename>. + section of <filename>/etc/systemd/sleep.conf</filename> or a + <filename>sleep.conf.d</filename> file. See <citerefentry><refentrytitle>systemd-sleep.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. </para> </refsect1> 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 */ |