diff options
| author | Pádraig Brady <P@draigBrady.com> | 2014-05-29 15:30:46 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2014-05-29 16:01:30 +0100 |
| commit | 25a2c948b24163ce0e0e9e52f6a5fef33d7d7842 (patch) | |
| tree | 60ab5ff2fcd550420e8657ba3962ae5a6dab2687 /tests/df | |
| parent | e4314774fd44bf2230a64f26c7f07383ddf6aa4c (diff) | |
| download | coreutils-25a2c948b24163ce0e0e9e52f6a5fef33d7d7842.tar.xz | |
df: use the last device name provided by the system
The device name reported for a particular mount entry
may no longer be valid if the mount point was subsequently
mounted on a different device. Therefore honor the order
of the mount list returned by the system and use the last
reported device name.
* src/df.c (filter_mount_list): When discarding the current
mount entry, ensure that a new device name is not also discarded.
* tests/df/skip-duplicates.sh: Add a test case. Also fix
a false failure in the edge case of a system with only a
single file system.
* NEWS: Mention the fix.
Diffstat (limited to 'tests/df')
| -rwxr-xr-x | tests/df/skip-duplicates.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/df/skip-duplicates.sh b/tests/df/skip-duplicates.sh index 44f7d4ca7..6fb6ff561 100755 --- a/tests/df/skip-duplicates.sh +++ b/tests/df/skip-duplicates.sh @@ -55,7 +55,7 @@ struct mntent *getmntent (FILE *fp) {.mnt_fsname="/fsname", .mnt_dir="/."}, {.mnt_fsname="/fsname", .mnt_dir="/"}, {.mnt_fsname="virtfs", .mnt_dir="/NONROOT"}, - {.mnt_fsname="virtfs", .mnt_dir="/NONROOT"}, + {.mnt_fsname="virtfs2", .mnt_dir="/NONROOT"}, {.mnt_fsname="netns", .mnt_dir="net:[1234567]"}, }; @@ -100,9 +100,14 @@ LD_PRELOAD=./k.so CU_TEST_DUPE_INVALID=1 df >out && fail=1 test $(wc -l <out) -eq $(expr 1 + $unique_entries) || { fail=1; cat out; } # df should also prefer "/fsname" over "fsname" -test $(grep -c '/fsname' <out) -eq 1 || { fail=1; cat out; } -# ... and "/fsname" with '/' as Mounted on over '/.' -test $(grep -cF '/.' <out) -eq 0 || { fail=1; cat out; } +if test "$unique_entries" = 2; then + test $(grep -c '/fsname' <out) -eq 1 || { fail=1; cat out; } + # ... and "/fsname" with '/' as Mounted on over '/.' + test $(grep -cF '/.' <out) -eq 0 || { fail=1; cat out; } +fi + +# df should use the last seen devname (mnt_fsname) +test $(grep -c 'virtfs2' <out) -eq 1 || { fail=1; cat out; } # Ensure that filtering duplicates does not affect -a processing. LD_PRELOAD=./k.so df -a >out || fail=1 |