From: Jan Kara <jack@suse.cz>
Date: Tue, 5 Nov 2019 13:43:20 +0000 (+0100)
Subject: common/quota: Fix _qmount_options
X-Git-Tag: v2022.05.01~956
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=6ad9168b0ad69669de63a8a7aee60205269f8e36

common/quota: Fix _qmount_options

_qmount_options didn't properly substitute usrjquota and grpjquota
options. Fix the regular expression.

Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/common/quota b/common/quota
index 6d1948bf..4e07fef1 100644
--- a/common/quota
+++ b/common/quota
@@ -229,10 +229,10 @@ _qmount_option()
 	export MOUNT_OPTIONS=`echo $MOUNT_OPTIONS \
 	| sed   -e 's/uquota/QUOTA/g'      \
 		-e 's/usrquota/QUOTA/g'    \
-		-e 's/usrjquota=[^, ]/QUOTA/g' \
+		-e 's/usrjquota=[^, ]*/QUOTA/g' \
 		-e 's/gquota/QUOTA/g'      \
 		-e 's/grpquota/QUOTA/g'    \
-		-e 's/grpjquota=[^, ]/QUOTA/g' \
+		-e 's/grpjquota=[^, ]*/QUOTA/g' \
 		-e 's/\bpquota/QUOTA/g'    \
 		-e 's/prjquota/QUOTA/g'    \
 		-e 's/quota/QUOTA/g'       \