Skip to contentSkip to conversation

common/rc: fix ignoring of errors on

PATCH New Luis Chamberlain 1 participant 1 message Aug 25, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 common/rc: fix ignoring of errors on

Commit 0c95c8acb ("common: hide permision warning from mkswap for exfat") and commit 08e93fa7c ("generic/554: hide permision warning on exfat") removed a warning by grepping an error out. It however broke use on older versions of bash such as 4.4.23:

./common/rc: line 2554: syntax error near unexpected token `>'
./common/rc: line 2554: ` MKSWAP_PROG "$fname" 2> >(grep -v 'insecure permission' >&2) >> $seqres.full'

Fix both instances by using a $(foo) to run the executable.

---
 common/rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
common/rc +2 -2
index e0b6d508..46b6b220 100644
@@ -2550,14 +2550,14 @@ _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> >(grep -v 'insecure permission' >&2)) >> $seqres.full
 }
 
 _swapon_file() {
 	local fname="$1"
 
 	# Ignore permission complaints on filesystems that don't support perms
-	swapon "$fname" 2> >(grep -v "insecure permissions" >&2)
+	$(swapon "$fname" 2> >(grep -v "insecure permissions" >&2))
 }
 
 # Check that the filesystem supports swapfiles
Signature · 1 line
2.30.2