From 3a5abf2d29292f56969e9c90b5698e71d456e2f8 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Tue, 17 Apr 2018 20:12:17 +0200 Subject: Use ssh as the default remote shell --- lib/stdlib/src/slave.erl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'lib/stdlib/src') 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}; -- cgit v1.2.3 From 4657060caaf43c40aae70225156db94805178bf8 Mon Sep 17 00:00:00 2001 From: Siri Hansen Date: Fri, 22 Feb 2019 10:58:12 +0100 Subject: Fix some missed comments about rsh --- lib/stdlib/src/slave.erl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/stdlib/src') diff --git a/lib/stdlib/src/slave.erl b/lib/stdlib/src/slave.erl index 21b8610b79..4791e3ebda 100644 --- a/lib/stdlib/src/slave.erl +++ b/lib/stdlib/src/slave.erl @@ -114,7 +114,7 @@ relay1(Pid) -> %% 1. There must be an ssh program on computer; if not an error %% is returned. %% -%% 2. The hosts must be configured to allowed 'ssh' access without +%% 2. The hosts must be configured to allow 'ssh' access without %% prompts for password. %% %% The slave node will have its filer and user server redirected @@ -341,9 +341,7 @@ do_quote_progname([Prog,Arg|Args]) -> lists:flatten(lists:map(fun(X) -> [" ",X] end, [Arg|Args])) end. -%% Give the user an opportunity to run another program, -%% than the "rsh". On HP-UX rsh is called remsh; thus HP users -%% must start erlang as erl -rsh remsh. +%% Give the user an opportunity to run another program than "ssh". %% %% Also checks that the given program exists. %% -- cgit v1.2.3