system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-06 16:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

mount: use the same fstab extension option syntax everywhere

Browse source 
The man page and the actual code differed, and this is now corrected
This commit is contained in:
Lennart Poettering 2012-05-22 02:00:53 +02:00
parent 2e9d6c1251
commit 92a39ae198
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
man/systemd.mount.xml
View file

@ -109,12 +109,9 @@
<para>When reading <filename>/etc/fstab</filename> a <para>When reading <filename>/etc/fstab</filename> a
few special mount options are understood by systemd few special mount options are understood by systemd
which influence how dependencies are created for mount which influence how dependencies are created for mount
points from <filename>/etc/fstab</filename>. If points from <filename>/etc/fstab</filename>. systemd
<option>MountAuto=yes</option> is set in will create a dependency of type
<filename>system.conf</filename> (which is the <option>Wants</option> from either
default), or if <option>x-systemd.mount</option> is
specified as mount option, then systemd will create a
dependency of type <option>Wants</option> from either
<filename>local-fs.target</filename> or <filename>local-fs.target</filename> or
<filename>remote-fs.target</filename>, depending <filename>remote-fs.target</filename>, depending
whether the file system is local or remote. If whether the file system is local or remote. If
@ -123,7 +120,7 @@
system. See system. See
<citerefentry><refentrytitle>systemd.automount</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd.automount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details. If for details. If
<option>x-systemd-device-timeout=</option> is <option>x-systemd.device-timeout=</option> is
specified it may be used to configure how long systemd specified it may be used to configure how long systemd
should wait for a device to show up before giving up should wait for a device to show up before giving up
on an entry from on an entry from

4
src/core/mount.c
View file

@ -358,7 +358,7 @@ static int mount_add_fstab_links(Mount *m) {
nofail = !!mount_test_option(p->options, "nofail"); nofail = !!mount_test_option(p->options, "nofail");
automount = automount =
mount_test_option(p->options, "comment=systemd.automount") || mount_test_option(p->options, "comment=systemd.automount") ||
mount_test_option(p->options, "x-systemd-automount"); mount_test_option(p->options, "x-systemd.automount");
if (mount_is_network(p)) { if (mount_is_network(p)) {
target = SPECIAL_REMOTE_FS_TARGET; target = SPECIAL_REMOTE_FS_TARGET;
@ -515,7 +515,7 @@ static int mount_fix_timeouts(Mount *m) {
if ((timeout = mount_test_option(p->options, "comment=systemd.device-timeout"))) if ((timeout = mount_test_option(p->options, "comment=systemd.device-timeout")))
timeout += 31; timeout += 31;
else if ((timeout = mount_test_option(p->options, "x-systemd-device-timeout"))) else if ((timeout = mount_test_option(p->options, "x-systemd.device-timeout")))
timeout += 25; timeout += 25;
else else
return 0; return 0;