From 2451c334ef2211667cd26de91b57226869f1b91a Mon Sep 17 00:00:00 2001 From: Eryu Guan Date: Wed, 23 Mar 2016 14:32:51 +1100 Subject: [PATCH] common: filter more messages from _scratch_mkfs_ext4 Commit a94334afa2ff ("common: filter warning messages from mkfs.ext4") filtered warning messages from mke2fs stderr output but missed the mke2fs version infomation message, and generic/135 still fails because of this QA output created by 135 +mke2fs 1.42.9 (28-Dec-2013) 0000000 1212 1212 1212 1212 1212 1212 1212 1212 So also filter out this message in _scratch_mkfs_ext4. Reported-by: Xiao Yang Signed-off-by: Eryu Guan Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/rc b/common/rc index 16f5a43a..8f925a8a 100644 --- a/common/rc +++ b/common/rc @@ -655,7 +655,7 @@ _scratch_mkfs_ext4() fi # output stored mkfs output - grep -v ^Warning: $tmp_dir.mkfserr >&2 + grep -v -e ^Warning: -e "^mke2fs " $tmp_dir.mkfserr >&2 cat $tmp_dir.mkfsstd rm -f $tmp_dir.mkfserr $tmp_dir.mkfsstd -- 2.47.3