mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-04-16 08:38:48 +02:00
f25519d688
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.
49 lines
1.7 KiB
Bash
Executable File
49 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
# Test df's behavior for skipping the pseudo "rootfs" file system.
|
|
|
|
# Copyright (C) 2012-2013 Free Software Foundation, Inc.
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
|
|
print_ver_ df
|
|
|
|
df || skip_ "df fails"
|
|
|
|
# Verify that rootfs is in mtab (and shown when the -a option is specified).
|
|
df -a >out || fail=1
|
|
grep '^rootfs' out || skip_ "no rootfs in mtab"
|
|
|
|
# Ensure that rootfs is suppressed when no options is specified.
|
|
df >out || fail=1
|
|
grep '^rootfs' out && { fail=1; cat out; }
|
|
|
|
# Ensure that rootfs is yet skipped when explicitly specifying "-t rootfs".
|
|
# As df emits "no file systems processed" in this case, it would be a failure
|
|
# if df exited with status Zero.
|
|
df -t rootfs >out && fail=1
|
|
grep '^rootfs' out && { fail=1; cat out; }
|
|
|
|
# Ensure that the rootfs is shown when explicitly both specifying "-t rootfs"
|
|
# and the -a option.
|
|
df -t rootfs -a >out || fail=1
|
|
grep '^rootfs' out || { fail=1; cat out; }
|
|
|
|
# Ensure that the rootfs is omitted in all_fs mode when it is explicitly
|
|
# black-listed.
|
|
df -a -x rootfs >out || fail=1
|
|
grep '^rootfs' out && { fail=1; cat out; }
|
|
|
|
Exit $fail
|