summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-01-15 18:10:11 +0100
committerLennart Poettering <lennart@poettering.net>2013-01-15 18:14:13 +0100
commitc32247e9d7c4231d4f731c9103d90b4e2e1682a2 (patch)
tree333d95ec107038530d727c8719f1bbea77794aac /man
parentdd6f5e4fb8a18822d1de8f98d5b24d1cb4d9e851 (diff)
man: correct order of precedence for fstab units
Diffstat (limited to 'man')
-rw-r--r--man/systemd.mount.xml12
1 files changed, 10 insertions, 2 deletions
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 2dc095e47b..7f879db709 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -153,8 +153,16 @@
<literal>h</literal>, <literal>ms</literal>.</para>
<para>If a mount point is configured in both
- <filename>/etc/fstab</filename> and a unit file, the
- configuration in the latter takes precedence.</para>
+ <filename>/etc/fstab</filename> and a unit file that
+ is stored below <filename>/usr</filename> the former
+ will take precedence. If the unit file is stored below
+ <filename>/etc</filename> it will take
+ precedence. This means: native unit files take
+ precedence over traditional configuration files, but
+ this is superseded by the rule that configuration in
+ <filename>/etc</filename> will always take precedence
+ over configuration in
+ <filename>/usr</filename>.</para>
</refsect1>
<refsect1>