summaryrefslogtreecommitdiff
path: root/man/systemd-suspend.service.xml
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-06-18 19:47:44 +0200
committerTom Gundersen <teg@jklm.no>2015-06-18 19:47:44 +0200
commit12b42c76672a66c2d4ea7212c14f8f1b5a62b78d (patch)
tree0a9f5aff7fc2f144765f936c618c563568edba1f /man/systemd-suspend.service.xml
parent74b1f5276365bbdf02dacec707fb9c40509650b4 (diff)
man: revert dynamic paths for split-usr setups
This did not really work out as we had hoped. Trying to do this upstream introduced several problems that probably makes it better suited as a downstream patch after all. At any rate, it is not releaseable in the current state, so we at least need to revert this before the release. * by adjusting the path to binaries, but not do the same thing to the search path we end up with inconsistent man-pages. Adjusting the search path too would be quite messy, and it is not at all obvious that this is worth the effort, but at any rate it would have to be done before we could ship this. * this means that distributed man-pages does not make sense as they depend on config options, and for better or worse we are still distributing man pages, so that is something that definitely needs sorting out before we could ship with this patch. * we have long held that split-usr is only minimally supported in order to boot, and something we hope will eventually go away. So before we start adding even more magic/effort in order to make this work nicely, we should probably question if it makes sense at all.
Diffstat (limited to 'man/systemd-suspend.service.xml')
-rw-r--r--man/systemd-suspend.service.xml13
1 files changed, 5 insertions, 8 deletions
diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index 2722d1840a..a8beb86f4d 100644
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
@@ -1,9 +1,6 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!--
This file is part of systemd.
@@ -59,7 +56,7 @@
<para><filename>systemd-suspend.service</filename></para>
<para><filename>systemd-hibernate.service</filename></para>
<para><filename>systemd-hybrid-sleep.service</filename></para>
- <para><filename>&rootlibexecdir;/system-sleep</filename></para>
+ <para><filename>/usr/lib/systemd/system-sleep</filename></para>
</refsynopsisdiv>
<refsect1>
@@ -78,7 +75,7 @@
<para>Immediately before entering system suspend and/or
hibernation <filename>systemd-suspend.service</filename> (and the
other mentioned units, respectively) will run all executables in
- <filename>&rootlibexecdir;/system-sleep/</filename> and pass two
+ <filename>/usr/lib/systemd/system-sleep/</filename> and pass two
arguments to them. The first argument will be
<literal>pre</literal>, the second either
<literal>suspend</literal>, <literal>hibernate</literal>, or
@@ -90,7 +87,7 @@
until all executables have finished.</para>
<para>Note that scripts or binaries dropped in
- <filename>&rootlibexecdir;/system-sleep/</filename> are intended
+ <filename>/usr/lib/systemd/system-sleep/</filename> are intended
for local use only and should be considered hacks. If applications
want to be notified of system suspend/hibernation and resume,
there are much nicer interfaces available.</para>
@@ -107,7 +104,7 @@
<literal>mem</literal> into <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>&pkgsysconfdir;/sleep.conf</filename> or a
+ 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>