michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Quotacheck isn't needed on XFS

Browse Source
This commit is contained in:
Jamie Cameron
2014-08-07 22:14:28 -07:00
parent 797f4d383d
commit 8d6fbb9532
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
quota/linux-lib.pl
View File

@@ -753,7 +753,7 @@ failure.
=cut
sub copy_user_quota
{
for($i=1; $i<@_; $i++) {
for(my $i=1; $i<@_; $i++) {
$out = &backquote_logged("$config{'user_copy_command'} ".
quotemeta($_[0])." ".quotemeta($_[$i])." 2>&1");
if ($?) { return $out; }
@@ -770,7 +770,7 @@ failure.
=cut
sub copy_group_quota
{
for($i=1; $i<@_; $i++) {
for(my $i=1; $i<@_; $i++) {
$out = &backquote_logged("$config{'group_copy_command'} ".
quotemeta($_[0])." ".quotemeta($_[$i])." 2>&1");
if ($?) { return $out; }
@@ -1010,5 +1010,16 @@ my $out = &backquote_logged("xfs_quota -x -c 'limit -g bsoft=${sblocks}k bhard=$
&error($out) if ($?);
}
=head2 can_quotacheck(fs)
Returns 1 if some FS supports quota checking
=cut
sub can_quotacheck
{
my ($fs) = @_;
return !&is_xfs_fs($fs);
}
1;

4
quota/list_groups.cgi
View File

@@ -32,7 +32,9 @@ print &ui_tabs_start(\@tabs, "mode", $in{'mode'} || 'list', 1);
if ($access{'ggrace'}) {
push(@ulinks, &ui_link("group_grace_form.cgi?filesys=".&urlize($f), $text{'lusers_egrace'}) );
}
push(@ulinks, &ui_link("check_quotas.cgi?filesys=".&urlize($f)."&source=group", $text{'lusers_check'}) );
if (!defined(&can_quotacheck) || &can_quotacheck($f)) {
push(@ulinks, &ui_link("check_quotas.cgi?filesys=".&urlize($f)."&source=group", $text{'lusers_check'}) );
}
# Groups list, in a tab
print &ui_tabs_start_tab("mode", "list");

4
quota/list_users.cgi
View File

@@ -32,7 +32,9 @@ print &ui_tabs_start(\@tabs, "mode", $in{'mode'} || 'list', 1);
if ($access{'ugrace'}) {
push(@ulinks, &ui_link("user_grace_form.cgi?filesys=".&urlize($f), $text{'lusers_egrace'}) );
}
push(@ulinks, &ui_link("check_quotas.cgi?filesys=".&urlize($f)."&source=user", $text{'lusers_check'}) );
if (!defined(&can_quotacheck) || &can_quotacheck($f)) {
push(@ulinks, &ui_link("check_quotas.cgi?filesys=".&urlize($f)."&source=user", $text{'lusers_check'}) );
}
# Users list, in a tab
print &ui_tabs_start_tab("mode", "list");