generic/050: Consistently remove traling dot from umount output

We did not consistently remove trailing dot from umount output which
can presumably lead to false failures with particular versions of
util-linux. Make sure all umount output is properly filtered.

Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Jan Kara
2019-11-11 15:49:53 +01:00
committed by Eryu Guan
parent e088479871
commit bb7c6d6172
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -67,7 +67,7 @@ touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
# http://oss.sgi.com/bugzilla/show_bug.cgi?id=807
#
echo "unmounting read-only filesystem"
_scratch_unmount 2>&1 | _filter_scratch
_scratch_unmount 2>&1 | _filter_scratch | _filter_ending_dot
echo "setting device read-write"
blockdev --setrw $SCRATCH_DEV
@@ -105,7 +105,7 @@ _scratch_unmount 2>&1 | _filter_scratch | _filter_ending_dot
echo "mounting filesystem with -o norecovery on a read-only device:"
_try_scratch_mount -o norecovery 2>&1 | _filter_ro_mount
echo "unmounting read-only filesystem"
_scratch_unmount 2>&1 | _filter_scratch
_scratch_unmount 2>&1 | _filter_scratch | _filter_ending_dot
echo "setting device read-write"
blockdev --setrw $SCRATCH_DEV
+2 -2
View File
@@ -4,7 +4,7 @@ mounting read-only block device:
mount: /mnt-scratch: permission denied
touching file on read-only filesystem (should fail)
unmounting read-only filesystem
umount: SCRATCH_DEV: not mounted.
umount: SCRATCH_DEV: not mounted
setting device read-write
mounting read-write block device:
touch files
@@ -19,7 +19,7 @@ umount: SCRATCH_DEV: not mounted
mounting filesystem with -o norecovery on a read-only device:
mount: /mnt-scratch: permission denied
unmounting read-only filesystem
umount: SCRATCH_DEV: not mounted.
umount: SCRATCH_DEV: not mounted
setting device read-write
mounting filesystem that needs recovery with -o ro:
*** done