From b7bb499496ff306d87a07ffd68c034f29b97bc37 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Thu, 19 Jun 2014 12:11:00 +0100 Subject: du: ignore directory cycles due to bind mounts * src/du.c (process_file): Treat cycles due to bind mounts like cycles due to following symlinks. * tests/du/bind-mount-dir-cycle.sh: Adjust accordingly. * NEWS: Mention the change in behavior. Reported at http://bugzilla.redhat.com/836557 --- tests/du/bind-mount-dir-cycle.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/du') diff --git a/tests/du/bind-mount-dir-cycle.sh b/tests/du/bind-mount-dir-cycle.sh index 4fef345cd..ac6bf2e24 100755 --- a/tests/du/bind-mount-dir-cycle.sh +++ b/tests/du/bind-mount-dir-cycle.sh @@ -27,12 +27,11 @@ mount --bind a a/b \ || skip_ "This test requires mount with a working --bind option." echo a > exp || framework_failure_ -echo "du: mount point 'a/b' already traversed" > exp-err || framework_failure_ -du a > out 2> err && fail=1 +du a > out 2> err || fail=1 sed 's/^[0-9][0-9]* //' out > k && mv k out -compare exp-err err || fail=1 +compare /dev/null err || fail=1 compare exp out || fail=1 Exit $fail -- cgit v1.2.3-54-g00ecf