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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
iliajie
2022-07-17 18:55:30 +03:00
parent e0a5c4e507 8d78254db7
commit 6e00a54538
2 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mount/linux-lib.pl
View File

@@ -1689,31 +1689,6 @@ if (($_[0] eq "nfs") || ($_[0] eq "nfs4")) {
$in{'nfs_host'}, "<pre>$dirlist</pre>"));
}
# Try a test mount to see if filesystem is available
$temp = &tempname();
&make_dir($temp, 0755);
&execute_command("mount -t $_[0] ".
quotemeta("$in{nfs_host}:$in{nfs_dir}")." ".
quotemeta($temp),
undef, \$mout, \$mout);
if ($mout =~ /No such file or directory/i) {
&error(&text('linux_enfsdir', $in{'nfs_dir'},
$in{'nfs_host'}, "<pre>$dirlist</pre>"));
}
elsif ($mout =~ /Permission denied/i) {
&error(&text('linux_enfsperm', $in{'nfs_dir'}, $in{'nfs_host'}));
}
elsif ($?) {
&error(&text('linux_enfsmount', "<tt>$mout</tt>"));
}
# It worked! unmount
local $umout;
&execute_command("umount ".quotemeta($temp), undef, \$umout, \$umout);
if ($?) {
&error(&text('linux_enfsmount', "<tt>$umout</tt>"));
}
rmdir(&translate_filename($temp)); # Don't delete mounted files!
return "$in{nfs_host}:$in{nfs_dir}";
}
elsif ($_[0] eq "auto") {

2
servers/servers-lib.pl
View File

@@ -33,7 +33,7 @@ our @cluster_modules = ( "cluster-software" );
our @server_types = (
# Linux sub-types, which have to come first
[ 'asianux', 'Asianux', undef, 'Asianux' ],
[ 'alma', 'Alma Linux', undef, 'Alma' ],
[ 'alma', 'AlmaLinux', undef, 'Alma' ],
[ 'centos', 'CentOS Linux', undef, 'CentOS' ],
[ 'ubuntu', 'Ubuntu Linux', undef, 'Ubuntu' ],
[ 'fedora', 'Fedora Linux', undef, 'Fedora' ],