Improve local quota override logic.

1 files changed, 7 insertions, 5 deletions

diff --git a/user-init b/user-init
index e47ae81..7895d5f 100755
--- a/user-init
+++ b/user-init
@@ -110,17 +110,19 @@ for user in $USERS; do
 #	if [ -x /etc/local/quota.sh ]; then
 #		/etc/local/quota.sh "$user"
 #		fi
-	quotasoft="$QUOTASOFT"
-	quotahard="$QUOTAHARD"
+	quotasoft_override=''
+	quotahard_override=''
 	for quotaoverride in $QUOTAOVERRIDES; do
 		for group in $groups; do
 			if [ "$quotaoverride" = "$group" ]; then
-				eval quotasoft=\"\$QUOTASOFT_${quotaoverride}\"
-				eval quotahard=\"\$QUOTAHARD_${quotaoverride}\"
-				continue
+				eval quotasoft_override=\"\$QUOTASOFT_${quotaoverride}\"
+				eval quotahard_override=\"\$QUOTAHARD_${quotaoverride}\"
+				break 2
 			fi
 		done
 	done
+	quotasoft="${quotasoft_override:-$QUOTASOFT}"
+	quotahard="${quotahard_override:-$QUOTAHARD}"
 	for quotahome in $QUOTAHOMES; do
 		if [ -n "$NEW_QUOTA" ]; then
 			setquota "$user" "$quotasoft" "$quotahard" 0 0 "$quotahome"