apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

overlay/036: filter busy mount message

Browse Source 
util-linux v2.30 changed error message of a busy mount and caused
overlay/036 to fail. e.g.

 - mount: <device> is already mounted or <mountpoint> busy
 + mount: <mountpoint>: <device> already mounted or mount point busy.

Filter the mount output by a newly introduced _filter_busy_mount
into a unified format.

   mount: device already mounted or mount point busy

Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Eryu Guan
2017-11-14 16:56:00 +08:00
parent 94d3a4f00c
commit 40737eac01
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/filter
+12
View File
@@ -423,6 +423,18 @@ _filter_error_mount()
sed -e "s/mount:\(.*failed:\)/mount:/" | _filter_ending_dot
}
# Similar to _filter_error_mount, filter a busy mount output.
# Turn both old (prior to util-linux v2.30) and new (v2.30 and later) format to
# a simple one. e.g.
# old: mount: <device> is already mounted or <mountpoint> busy
# new: mount: <mountpoint>: <device> already mounted or mount point busy.
# filtered: mount: device already mounted or mount point busy
_filter_busy_mount()
{
sed -e "s/.*: .* already mounted or .* busy/mount: device already mounted or mount point busy/" | \
_filter_ending_dot
}
_filter_od()
{
BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)