michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-09-20 04:20:39 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

If fstab has a usrquota=file directive, use it when checking if quotas are active https://sourceforge.net/tracker/?func=detail&atid=117457&aid=3602466&group_id=17457

Browse Source
This commit is contained in:
Jamie Cameron
2013-01-28 19:44:37 -08:00
parent db5b0e879d
commit 627f56f06c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
quota/linux-lib.pl
View File

@@ -103,6 +103,8 @@ sub quota_now
local $rv = 0;
local $dir = $_[0]->[0];
local %opts = map { $_, 1 } split(/,/, $_[0]->[3]);
local $ufile = $_[1]->[3] =~ /(usrquota|usrjquota)=([^, ]+)/ ? $2 : undef;
local $gfile = $_[1]->[3] =~ /(grpquota|grpjquota)=([^, ]+)/ ? $2 : undef;
if ($_[0]->[2] eq "xfs") {
# For XFS, assume enabled if setup in fstab
$rv += 1 if ($opts{'quota'} || $opts{'usrquota'} ||
@@ -112,7 +114,8 @@ if ($_[0]->[2] eq "xfs") {
}
if ($_[0]->[4]%2 == 1) {
# test user quotas
if (-r "$dir/quota.user" || -r "$dir/aquota.user") {
if (-r "$dir/quota.user" || -r "$dir/aquota.user" ||
$ufile && -r "$dir/$ufile") {
local $stout = &supports_status($dir, "user");
if ($stout =~ /is\s+(on|off|enabled|disabled)/) {
# Can use output from -p mode
@@ -144,7 +147,8 @@ if ($_[0]->[4]%2 == 1) {
}
if ($_[0]->[4] > 1) {
# test group quotas
if (-r "$dir/quota.group" || -r "$dir/aquota.group") {
if (-r "$dir/quota.group" || -r "$dir/aquota.group" ||
$gfile && -r "$dir/$gfile") {
local $stout = &supports_status($dir, "group");
if ($stout =~ /is\s+(on|off|enabled|disabled)/) {
# Can use output from -p mode