From: Xiong Zhou <xzhou@redhat.com>
Date: Wed, 1 Sep 2021 09:40:24 +0000 (+0800)
Subject: common/rc: fix MKSWAP_PROG quoting
X-Git-Tag: v2022.05.01~250
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1506607a5c2b183a0b8e0f12b5273e7054a29f4c;p=xfstests-dev.git

common/rc: fix MKSWAP_PROG quoting

After commit
  0e4dd8b9 common/rc: fix ignoring of errors on
we are getting this error message when running swapfiles tests:
  +./common/rc: line 2553: MKSWAP_PROG: command not found

Rewrite the line.

Signed-off-by: Murphy Zhou <xzhou@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/common/rc b/common/rc
index f89e3276..9dc6df94 100644
--- a/common/rc
+++ b/common/rc
@@ -2550,7 +2550,8 @@ _format_swapfile() {
 	$CHATTR_PROG +C "$fname" > /dev/null 2>&1
 	_pwrite_byte 0x61 0 "$sz" "$fname" >> $seqres.full
 	# Ignore permission complaints on filesystems that don't support perms
-	$(MKSWAP_PROG "$fname" 2> >(grep -v 'insecure permission' >&2)) >> $seqres.full
+	$MKSWAP_PROG "$fname" 2>&1 >> $seqres.full | \
+		grep -v "insecure permission"
 }
 
 _swapon_file() {