From dd1e3468f43001c188a26a05399f11be3b67139d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Sun, 23 Feb 2025 22:55:10 -0500 Subject: [PATCH] * Sun Feb 23 2025 Jean-Philippe Pialasse 11.0.0-5.sme - enable quota on home partition too if ext or xfs [SME: 12912] --- contriborbase | 1 - root/etc/e-smith/templates/etc/fstab/50EnableQuotas | 10 ++++++---- smeserver-quota.spec | 5 ++++- 3 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 contriborbase diff --git a/contriborbase b/contriborbase deleted file mode 100644 index ef36a67..0000000 --- a/contriborbase +++ /dev/null @@ -1 +0,0 @@ -sme10 diff --git a/root/etc/e-smith/templates/etc/fstab/50EnableQuotas b/root/etc/e-smith/templates/etc/fstab/50EnableQuotas index 31ae794..27db617 100644 --- a/root/etc/e-smith/templates/etc/fstab/50EnableQuotas +++ b/root/etc/e-smith/templates/etc/fstab/50EnableQuotas @@ -1,10 +1,12 @@ { - # Change defaults => usrquota,grpquota for / file system + # Change defaults => usrquota,grpquota for /, /home or /home/e-smith ext* file system + # Change defaults => uquota,gquota for /, /home or /home/e-smith xfs file system @lines = map { - /\s\/\s+ext[234]\s+defaults\s/ && s/defaults/usrquota,grpquota/; + /\s(\/|\/home|\/home\/e-smith)\s+ext[234]\s+defaults\s/ && s/defaults/usrquota,grpquota/; /^\/dev\/main\/.*\s+ext[234]\s+defaults\s/ && s/defaults/usrquota,grpquota/; - /\s\/\s+xfs\s+defaults\s/ && s/defaults/uquota,gquota/; - /^\/dev\/main\/.*\s+xfs\s+defaults\s/ && s/defaults/uquota,gquota/; + /\s(\/|\/home|\/home\/e-smith)\s+xfs\s+defaults\s/ && s/defaults/uquota,gquota/; + /^\/dev\/main\/.*\s+xfs\s+defaults\s/ && s/defaults/uquota,gquota/; + /^\/dev\/mapper\/(kss-home|kss-root).*\s+xfs\s+defaults\s/ && s/defaults/uquota,gquota/; $_ } @lines; ""; diff --git a/smeserver-quota.spec b/smeserver-quota.spec index 1354885..e3b7418 100644 --- a/smeserver-quota.spec +++ b/smeserver-quota.spec @@ -4,7 +4,7 @@ Summary: smeserver server and gateway - quota module %define name smeserver-quota Name: %{name} %define version 11.0.0 -%define release 4 +%define release 5 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -25,6 +25,9 @@ Provides: e-smith-quota smeserver server and gateway software - quota module. %changelog +* Sun Feb 23 2025 Jean-Philippe Pialasse 11.0.0-5.sme +- enable quota on home partition too if ext or xfs [SME: 12912] + * Thu Apr 04 2024 Brian Read 11.0.0-4.sme - Update createlinks to create smeserver-package-update event[SME: 12579]