From 72ebbf3450340338d71ea2039dfb296bc1d595db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 25 Dec 2013 23:20:57 -0500 Subject: [PATCH] man: document fail/nofail, auto/noauto Also s/filesystem/file system/ in a few places. --- TODO | 2 -- man/systemd-fsck@.service.xml | 2 +- man/systemd-fstab-generator.xml | 9 +++++---- man/systemd-halt.service.xml | 2 +- man/systemd.mount.xml | 20 +++++++++++++++++++- man/systemd.unit.xml | 2 +- man/udevadm.xml | 2 +- 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/TODO b/TODO index 0069a9241..e63463923 100644 --- a/TODO +++ b/TODO @@ -101,8 +101,6 @@ Features: Maybe take a BSD lock at the disk device node and teach udev to check for that and suppress event handling. -* document logic of auto/noauto and fail/nofail in fstab in systemd.mount or systemd-fstab-generator man page - * something pulls in pcre as shared object dependency into our daemons such as hostnamed. * allow implementation of InaccessibleDirectories=/ plus diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml index 811392b19..c653dc59d 100644 --- a/man/systemd-fsck@.service.xml +++ b/man/systemd-fsck@.service.xml @@ -65,7 +65,7 @@ file system. The root file system check is performed before the other file systems. Either service is enabled at boot if passno in /etc/fstab for - the filesystem is set to a value greater than zero. + the file system is set to a value greater than zero. systemd-fsck will forward file system checking progress to the diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml index 8996686e7..e3cf5d2bf 100644 --- a/man/systemd-fstab-generator.xml +++ b/man/systemd-fstab-generator.xml @@ -61,10 +61,11 @@ reloaded. This will instantiate mount and swap units as necessary. - The passno field - is treated like a simple boolean, and the ordering information - is discarded. However, the root filesystem is checked - before all the other filesystems. + The passno field is treated + like a simple boolean, and the ordering information is + discarded. However, if the root file system is + checked, it is checked before all the other + file systems. See systemd.mount5 diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml index a39253d8c..552dbdf68 100644 --- a/man/systemd-halt.service.xml +++ b/man/systemd-halt.service.xml @@ -86,7 +86,7 @@ It is necessary to have this code in a separate binary because otherwise rebooting after an upgrade might be broken — the running PID 1 could still depend on libraries which are not - available any more, thus keeping the filesystem busy, which + available any more, thus keeping the file system busy, which then cannot be re-mounted read-only. Immediately before executing the actual system diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index b181949b1..657cf11be 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -132,7 +132,10 @@ for details). Mounts listed in /etc/fstab will be converted into native units dynamically at boot and when the - configuration of the system manager is reloaded. See + configuration of the system manager is reloaded. In + general, configuring mount points through + /etc/fstab is the preferred + approach. See systemd-fstab-generator8 for details about the conversion. @@ -159,6 +162,21 @@ s, min, h, ms. + If is given, this mount + will be only wanted, not required, by the + local-fs.target. This means that + the boot will continue even if this mount point is not + mounted successfully. Option has + the opposite meaning and is the default. + + If is given, this mount + will not be added as a dependency for + local-fs.target. This means that + it will not be mounted automatically during boot, + unless it is pulled in by some other unit. Option + has the opposite meaning and is + the default. + If a mount point is configured in both /etc/fstab and a unit file that is stored below /usr, the former diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 487827cdd..2a965f5a1 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -232,7 +232,7 @@ multiple units from a single configuration file. If systemd looks for a unit configuration file, it will first search for the literal unit name in the - filesystem. If that yields no success and the unit + file system. If that yields no success and the unit name contains an @ character, systemd will look for a unit template that shares the same name but with the instance string (i.e. the part between the @ character diff --git a/man/udevadm.xml b/man/udevadm.xml index 6fc4e8d50..f5aafe50b 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -528,7 +528,7 @@ - Alternative root path in the filesystem for reading and writing files. + Alternative root path in the file system for reading and writing files. -- 2.30.2