michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-02 01:02:59 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix to ensure /tmp on tmpfs is displayed as separate mount

Browse Source
This commit is contained in:
Ilia Ross
2026-03-01 15:15:17 +02:00
parent d7434c61a2
commit b4984e495d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mount/mount-lib.pl
View File

@@ -318,11 +318,12 @@ if (&has_command("zpool")) {
# Add up all local filesystems
foreach my $m (@mounted) {
my $tmp_is_tmpfs = $m->[0] eq "/tmp" && $m->[2] eq "tmpfs";
if ($m->[2] =~ /^ext/ ||
$m->[2] eq "reiserfs" || $m->[2] eq "ufs" || $m->[2] eq "f2fs" ||
$m->[2] eq "zfs" || $m->[2] eq "simfs" || $m->[2] eq "vzfs" ||
$m->[2] eq "xfs" || $m->[2] eq "jfs" || $m->[2] eq "btrfs" ||
$m->[2] eq "apfs" || $m->[2] eq "fuseblk" ||
$m->[2] eq "apfs" || $m->[2] eq "fuseblk" || $tmp_is_tmpfs ||
$m->[1] =~ /^\/dev\// ||
&indexof($m->[1], @$always) >= 0) {
my $zp;
@@ -333,13 +334,13 @@ foreach my $m (@mounted) {
$zp = $zpools{$1};
}
if ($donedevice{$m->[0]}++ ||
$donedevice{$m->[1]}++) {
!$tmp_is_tmpfs && $donedevice{$m->[1]}++) {
# Don't double-count mounts from the same device, or
# on the same directory.
next;
}
my @st = stat($m->[0]);
if (@st && $donedevno{$st[0]}++) {
if (!$tmp_is_tmpfs && @st && $donedevno{$st[0]}++) {
# Don't double-count same filesystem by device number
next;
}