diff options
| author | Bernhard Voelker <mail@bernhard-voelker.de> | 2013-01-28 14:56:44 +0100 |
|---|---|---|
| committer | Bernhard Voelker <mail@bernhard-voelker.de> | 2013-01-28 14:56:44 +0100 |
| commit | f25519d6887fc9285d3e0ff1cd259a5e74d5a80a (patch) | |
| tree | 4d7dd5cee10158c8d2e314d650a5926e23effa01 /doc | |
| parent | bb116d35bf6248d803826fb582a141d02a311e71 (diff) | |
| download | coreutils-f25519d6887fc9285d3e0ff1cd259a5e74d5a80a.tar.xz | |
df: do not treat rootfs specially
Like any other pseudo file system, df should show rootfs only
when the -a option is specified, i.e. specifying -trootfs alone
is not sufficient. As the rootfs entry is now elided by the
general deduplication in filter_mount_list (commit v8.20-103-gbb116d3),
all other references to rootfs can be removed again.
* src/df.c (show_rootfs): Remove global variable.
(ROOTFS): Remove constant.
(filter_mount_list): Remove case to handle rootfs specially.
(main): In the case for handling the -t option, remove setting
of the show_rootfs variable.
* tests/df/skip-rootfs.sh: Adapt the test case "df -t rootfs":
the rootfs file system must not be printed (because no -a).
* doc/coreutils.texi (df invocation): Correct the documentation
about eliding mount entries: it is not the first occurrence of
the the device which wins, but now rather the entry with the
shortest mount point name. Also adapt the description about
eliding pseudo file system types like rootfs.
* NEWS (Changes in behavior): Adapt entry.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/coreutils.texi | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 1d508c996..eac8d52bb 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -10588,13 +10588,14 @@ Normally the disk space is printed in units of Non-integer quantities are rounded up to the next higher unit. For bind mounts and without arguments, @command{df} only outputs the statistics -for the first occurrence of that device in the list of file systems +for that device with the shortest mount point name in the list of file systems (@var{mtab}), i.e., it hides duplicate entries, unless the @option{-a} option is specified. -By default, @command{df} omits the early-boot pseudo file system type -@samp{rootfs}, unless the @option{-a} option is specified or that file system -type is explicitly to be included by using the @option{-t} option. +With the same logic, @command{df} elides a mount entry of a dummy pseude device +if there is another mount entry of a real block device for that mount point with +the same device number, e.g. the early-boot pseudo file system @samp{rootfs} is +not shown per default when already the real root device has been mounted. @cindex disk device file @cindex device file, disk |