]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #1880 from fsateler/sysctl-doc
authorLennart Poettering <lennart@poettering.net>
Fri, 13 Nov 2015 15:40:37 +0000 (16:40 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 13 Nov 2015 15:40:37 +0000 (16:40 +0100)
man: document systemd-sysctl arguments

1  2 
man/systemd-sysctl.service.xml

index 55c8953722b1b324f3162d0d4909f80f1037b5f2,2a2c7b2a132acd4e47ddb438c2cc61e2442873d5..9027ff0f3fce3a6025ee9b1b398616f2f0068016
@@@ -19,7 -19,8 +19,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-sysctl.service">
+ <refentry id="systemd-sysctl.service"
+     xmlns:xi="http://www.w3.org/2001/XInclude">
  
    <refentryinfo>
      <title>systemd-sysctl.service</title>
    </refnamediv>
  
    <refsynopsisdiv>
+     <cmdsynopsis>
+       <command>/usr/lib/systemd/systemd-sysctl</command>
+       <arg choice="opt" rep="repeat">OPTIONS</arg>
+       <arg choice="opt" rep="repeat"><replaceable>CONFIGFILE</replaceable></arg>
+     </cmdsynopsis>
      <para><filename>systemd-sysctl.service</filename></para>
-     <para><filename>/usr/lib/systemd/systemd-sysctl</filename></para>
    </refsynopsisdiv>
  
    <refsect1>
      <title>Description</title>
  
 -    <para><filename>systemd-sysctl.service</filename> is an early-boot
 +    <para><filename>systemd-sysctl.service</filename> is an early boot
      service that configures
      <citerefentry project='man-pages'><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>
      kernel parameters.</para>
  
+     <para>If invoked with no arguments, it applies all directives from
+     all configuration files in
+     <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+     are searched for a matching file. If one or more filenames are passed on
+     the command line, only the directives in these files are applied.
+     </para>
      <para>See
      <citerefentry project='man-pages'><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
      for information about the configuration of this service.</para>
    </refsect1>
  
+   <refsect1><title>Options</title>
+     <variablelist>
+       <varlistentry id='path'>
+         <term><option>--path=</option></term>
+         <listitem>
+           <para>Only apply rules with the specified prefix.</para>
+         </listitem>
+       </varlistentry>
+       <xi:include href="standard-options.xml" xpointer="help" />
+       <xi:include href="standard-options.xml" xpointer="version" />
+     </variablelist>
+   </refsect1>
    <refsect1>
      <title>See Also</title>
      <para>