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

Fix ext4 quota detection for LABEL and UUID mounts

Browse Source 
Fixes https://forum.virtualmin.com/t/failed-to-turn-on-quotas-quotaon-using-on-dev-sda1-home-file-exist/137832
This commit is contained in:
Ilia Ross
2026-09-10 04:14:10 +02:00
parent 1ee78eefb0
commit 10c328ef4d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@
* Fix IPsec host key generation with modern Libreswan [#2132](https://github.com/webmin/webmin/issues/2132)
* Fix journal since filter showing oldest entries on older systemd [forum.virtualmin.com/t/137876](https://forum.virtualmin.com/t/137876)
* Fix disk usage and mounted filesystem handling for mount points and devices with spaces, such as ZFS datasets [#2833](https://github.com/webmin/webmin/issues/2833)
* Fix native ext4 quota detection for filesystems mounted using `LABEL=` or `UUID=` identifiers [forum.virtualmin.com/t/137832](https://forum.virtualmin.com/t/137832)
* Fix slave zone files staying empty on Debian and Ubuntu secondaries by creating BIND zone files owned by the `bind` user [forum.virtualmin.com/t/137767](https://forum.virtualmin.com/t/137767)
* Fix Nginx Webserver module lock files not being released, causing saves to hang during long-running operations

3
quota/linux-lib.pl
View File

@@ -1058,7 +1058,8 @@ $mnt ||= (grep { $_->[0] eq $fs } &mount::list_mounted())[0];
return $hidden_ext_quota_mode_cache{$fs} = 0
if (!$mnt || $mnt->[2] !~ /^ext\d+$/ || !&has_command("tune2fs"));
my $dev = $mnt->[3] =~ /(?:^|,)loop=([^,]+)/ ? $1 : $mnt->[1];
$dev = &resolve_and_simplify($dev);
# Preserve LABEL= and UUID= specifiers, which tune2fs resolves itself.
$dev = &resolve_and_simplify($dev) if ($dev !~ /^(?:LABEL|UUID)=/);
&clean_language();
my $out = &backquote_command("tune2fs -l ".quotemeta($dev)." 2>/dev/null");
&reset_environment();