diff options
| author | Henrik Nord <[email protected]> | 2011-11-01 11:29:04 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-11-01 11:29:10 +0100 |
| commit | 80baec6cce1157aabba4c927e783ab41633a24a2 (patch) | |
| tree | 1410319f5a86f7e6a7ecf01e1866ff02ab1639a8 /lib/kernel | |
| parent | d5ebc4c1409284e0a343a64edf7d75308a1b3dd2 (diff) | |
| parent | 73d1959237d0a77dc10f57d83f6c2ed065a90528 (diff) | |
| download | otp-80baec6cce1157aabba4c927e783ab41633a24a2.tar.gz otp-80baec6cce1157aabba4c927e783ab41633a24a2.tar.bz2 otp-80baec6cce1157aabba4c927e783ab41633a24a2.zip | |
Merge branch 'rc/remote-shell-completion'
OTP-9673
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/src/user_drv.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/kernel/src/user_drv.erl b/lib/kernel/src/user_drv.erl index c34f2ddeb0..e33b4830ab 100644 --- a/lib/kernel/src/user_drv.erl +++ b/lib/kernel/src/user_drv.erl @@ -117,8 +117,9 @@ server1(Iport, Oport, Shell) -> {Curr,Shell1} = case init:get_argument(remsh) of {ok,[[Node]]} -> - RShell = {list_to_atom(Node),shell,start,[]}, - RGr = group:start(self(), RShell), + ANode = list_to_atom(Node), + RShell = {ANode,shell,start,[]}, + RGr = group:start(self(), RShell, rem_sh_opts(ANode)), {RGr,RShell}; E when E =:= error ; E =:= {ok,[[]]} -> {group:start(self(), Shell),Shell} @@ -134,6 +135,9 @@ server1(Iport, Oport, Shell) -> %% Enter the server loop. server_loop(Iport, Oport, Curr, User, Gr). +rem_sh_opts(Node) -> + [{expand_fun,fun(B)-> rpc:call(Node,edlin_expand,expand,[B]) end}]. + %% start_user() %% Start a group leader process and register it as 'user', unless, %% of course, a 'user' already exists. |