diff --git a/mount/linux-lib.pl b/mount/linux-lib.pl index 23a8ba60e..93b559b07 100755 --- a/mount/linux-lib.pl +++ b/mount/linux-lib.pl @@ -1689,31 +1689,6 @@ if (($_[0] eq "nfs") || ($_[0] eq "nfs4")) { $in{'nfs_host'}, "
$dirlist
")); } - # 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'}, "
$dirlist
")); - } - elsif ($mout =~ /Permission denied/i) { - &error(&text('linux_enfsperm', $in{'nfs_dir'}, $in{'nfs_host'})); - } - elsif ($?) { - &error(&text('linux_enfsmount', "$mout")); - } - # It worked! unmount - local $umout; - &execute_command("umount ".quotemeta($temp), undef, \$umout, \$umout); - if ($?) { - &error(&text('linux_enfsmount', "$umout")); - } - rmdir(&translate_filename($temp)); # Don't delete mounted files! - return "$in{nfs_host}:$in{nfs_dir}"; } elsif ($_[0] eq "auto") { diff --git a/servers/servers-lib.pl b/servers/servers-lib.pl index 92528c239..2c3953124 100755 --- a/servers/servers-lib.pl +++ b/servers/servers-lib.pl @@ -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' ],