Merge branch 'master' of github.com:webmin/webmin

Treat fuseblk as a local disk filesystem
https://github.com/webmin/webmin/issues/2624
2026-02-03 14:13:29 +00:00 · 2026-01-29 20:02:47 -08:00 · 2026-01-29 20:00:34 -08:00 · 2026-01-27 02:24:59 +02:00 · 2026-01-26 22:55:18 +02:00
2 changed files with 4 additions and 4 deletions
--- a/mount/mount-lib.pl
+++ b/mount/mount-lib.pl
@@ -322,7 +322,7 @@ foreach my $m (@mounted) {
 	    $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 "apfs" || $m->[2] eq "fuseblk" ||
 	    $m->[1] =~ /^\/dev\// ||
 	    &indexof($m->[1], @$always) >= 0) {
 		my $zp;
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -415,9 +415,9 @@ push(@can_dirs, $gconfig{'tempdir_sys'}) if ($gconfig{'tempdir_sys'});
 # Common fallbacks
 push(@can_dirs, "/dev/shm", "/tmp", "/var/tmp", "/usr/tmp");

-# Remove duplicate entries, which can happen when both configured
-# dirs are set to the same path, or when a configured path matches one of
-# the built-in defaults
+# Remove duplicate entries, which can happen when both configured dirs are set
+# to the same path, or when a configured path matches one of the built-in
+# defaults
@can_dirs = &unique(@can_dirs);

 # Test each candidate in turn
Author	SHA1	Message	Date
Jamie Cameron	736c320a60	Merge branch 'master' of github.com:webmin/webmin Some checks failed webmin.dev: webmin/webmin / build (push) Has been cancelled Details	2026-01-29 20:02:47 -08:00
Jamie Cameron	0ecbb04e00	Treat fuseblk as a local disk filesystem https://github.com/webmin/webmin/issues/2624	2026-01-29 20:00:34 -08:00
Ilia Ross	2dfa6cfc1b	Merge branch 'master' of github.com:webmin/webmin Some checks failed webmin.dev: webmin/webmin / build (push) Has been cancelled Details	2026-01-27 02:24:59 +02:00
Ilia Ross	e6184a0036	Fix to only check for uniqueness	2026-01-26 22:55:18 +02:00