aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorRichard Carlsson <[email protected]>2018-04-17 20:12:17 +0200
committerRichard Carlsson <[email protected]>2018-11-26 11:16:36 +0100
commit3a5abf2d29292f56969e9c90b5698e71d456e2f8 (patch)
treea63da7f26d11fae6f7e0dce19bc83a440f123a0c /lib/stdlib/src
parent9db0c37b94cb7eb2b5a50b5e843ec6e7d0b248b2 (diff)
downloadotp-3a5abf2d29292f56969e9c90b5698e71d456e2f8.tar.gz
otp-3a5abf2d29292f56969e9c90b5698e71d456e2f8.tar.bz2
otp-3a5abf2d29292f56969e9c90b5698e71d456e2f8.zip
Use ssh as the default remote shell
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/slave.erl13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/stdlib/src/slave.erl b/lib/stdlib/src/slave.erl
index 5e8c1a43ea..21b8610b79 100644
--- a/lib/stdlib/src/slave.erl
+++ b/lib/stdlib/src/slave.erl
@@ -104,18 +104,17 @@ relay1(Pid) ->
%% this to work is that the 'erl' program can be found in PATH.
%%
%% If the master and slave are on different hosts, start/N uses
-%% the 'rsh' program to spawn an Erlang node on the other host.
+%% the 'ssh' program to spawn an Erlang node on the other host.
%% Alternative, if the master was started as
%% 'erl -sname xxx -rsh my_rsh...', then 'my_rsh' will be used instead
-%% of 'rsh' (this is useful for systems where the rsh program is named
-%% 'remsh').
+%% of 'ssh' (this is useful for systems still using rsh or remsh).
%%
%% For this to work, the following conditions must be fulfilled:
%%
-%% 1. There must be an Rsh program on computer; if not an error
+%% 1. There must be an ssh program on computer; if not an error
%% is returned.
%%
-%% 2. The hosts must be configured to allowed 'rsh' access without
+%% 2. The hosts must be configured to allowed 'ssh' access without
%% prompts for password.
%%
%% The slave node will have its filer and user server redirected
@@ -286,7 +285,7 @@ register_unique_name(Number) ->
%% Makes up the command to start the nodes.
%% If the node should run on the local host, there is
-%% no need to use rsh.
+%% no need to use a remote shell.
mk_cmd(Host, Name, Args, Waiter, Prog0) ->
Prog = quote_progname(Prog0),
@@ -354,7 +353,7 @@ rsh() ->
Rsh =
case init:get_argument(rsh) of
{ok, [[Prog]]} -> Prog;
- _ -> "rsh"
+ _ -> "ssh"
end,
case os:find_executable(Rsh) of
false -> {error, no_rsh};