shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

man: add missing descriptions of fstab options to systemd.swap(5)

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-12-01 22:58:31 +01:00
parent de59724865
commit f0c5cda251
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
man/systemd.mount.xml
View File

@ -263,7 +263,7 @@
for details.</para></listitem> for details.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry id='device-timeout'>
<term><option>x-systemd.device-timeout=</option></term> <term><option>x-systemd.device-timeout=</option></term>
<listitem><para>Configure how long systemd should wait for a <listitem><para>Configure how long systemd should wait for a
@ -303,7 +303,7 @@
<varlistentry> <varlistentry>
<term><option>x-systemd.makefs</option></term> <term><option>x-systemd.makefs</option></term>
<listitem><para>The file system or swap structure will be initialized <listitem><para>The file system will be initialized
on the device. If the device is not "empty", i.e. it contains any signature, on the device. If the device is not "empty", i.e. it contains any signature,
the operation will be skipped. It is hence expected that this option the operation will be skipped. It is hence expected that this option
remains set even after the device has been initalized.</para> remains set even after the device has been initalized.</para>

24
man/systemd.swap.xml
View File

@ -6,7 +6,9 @@
SPDX-License-Identifier: LGPL-2.1+ SPDX-License-Identifier: LGPL-2.1+
--> -->
<refentry id="systemd.swap"> <refentry id="systemd.swap"
xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>
<title>systemd.swap</title> <title>systemd.swap</title>
<productname>systemd</productname> <productname>systemd</productname>
@ -141,6 +143,26 @@
successfully.</para> successfully.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<xi:include href="systemd.mount.xml" xpointer="device-timeout" />
<varlistentry>
<term><option>x-systemd.makefs</option></term>
<listitem><para>The swap structure will be initialized on the device. If the device is not
"empty", i.e. it contains any signature, the operation will be skipped. It is hence expected
that this option remains set even after the device has been initalized.</para>
<para>Note that this option can only be used in <filename>/etc/fstab</filename>, and will be
ignored when part of the <varname>Options=</varname> setting in a unit file.</para>
<para>See
<citerefentry><refentrytitle>systemd-mkswap@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
and the discussion of
<citerefentry project='man-pages'><refentrytitle>wipefs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
in <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para></listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect1> </refsect1>