summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2015-05-25 12:11:23 +0200
committerTom Gundersen <teg@jklm.no>2015-05-25 17:06:15 +0200
commitbf1d7ba70aceddb5dae0cd2e370b8afaf0c81b05 (patch)
tree76ad4d459f83627376e4d21fd651d44637f6bf90 /man
parent49f582c0a09100e7b282a32af2b2da66828ddcde (diff)
swap: use swapon -o
This patch simplify swapon usage in systemd. The command swapon(8) since util-linux v2.26 supports "-o <list>". The idea is exactly the same like for mount(8). The -o specifies options in fstab-compatible way. For systemd it means that it does not have to care about things like "discard" or another swapon specific options. swapon -o <options-from-fstab> For backward compatibility the code cares about "Priority:" swap unit field (for a case when Priority: is set, but pri= in the Options: is missing). References: http://lists.freedesktop.org/archives/systemd-devel/2014-October/023576.html
Diffstat (limited to 'man')
-rw-r--r--man/systemd.swap.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 5016f453d5..c398677f43 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -177,7 +177,8 @@
<listitem><para>Swap priority to use when activating the swap
device or file. This takes an integer. This setting is
- optional.</para></listitem>
+ optional and ignored when priotiry is set by <option>pri=</option> in the
+ <varname>Options=</varname> option.</para></listitem>
</varlistentry>
<varlistentry>