diff options
| author | Lukas Larsson <[email protected]> | 2016-05-27 08:53:33 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-27 08:53:33 +0200 |
| commit | ea8064b1bbda0ef59420ec8a805f3ee52630d704 (patch) | |
| tree | fd8351867db2f6038002d13970ff385838e1bf73 /lib/kernel/src/net_adm.erl | |
| parent | e5f436615f0649a4d19b03762c016e91e0dce0eb (diff) | |
| parent | 8ff06daa90c7c3c599c9e8cbc93fe98c2ed5ebfa (diff) | |
| download | otp-ea8064b1bbda0ef59420ec8a805f3ee52630d704.tar.gz otp-ea8064b1bbda0ef59420ec8a805f3ee52630d704.tar.bz2 otp-ea8064b1bbda0ef59420ec8a805f3ee52630d704.zip | |
Merge branch 'legoscia/erts/epmd-module-option/OTP-13627'
* legoscia/erts/epmd-module-option/OTP-13627:
Add tests for -start_epmd and -epmd_module options
Use the -epmd_module flag consistently
Add -start_epmd command line option
Diffstat (limited to 'lib/kernel/src/net_adm.erl')
| -rw-r--r-- | lib/kernel/src/net_adm.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/src/net_adm.erl b/lib/kernel/src/net_adm.erl index a38356c224..8ec275b88b 100644 --- a/lib/kernel/src/net_adm.erl +++ b/lib/kernel/src/net_adm.erl @@ -96,7 +96,8 @@ names() -> Reason :: address | file:posix(). names(Hostname) -> - erl_epmd:names(Hostname). + ErlEpmd = net_kernel:epmd_module(), + ErlEpmd:names(Hostname). -spec dns_hostname(Host) -> {ok, Name} | {error, Host} when Host :: atom() | string(), |