aboutsummaryrefslogtreecommitdiffstats
path: root/erts/epmd/src/epmd.c
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2010-07-07 11:46:21 +0200
committerRaimo Niskanen <[email protected]>2010-07-07 11:46:21 +0200
commit69764c865db61c0351be215f7f36947a71ef82f1 (patch)
tree3afd851e85535a507df3f2418fe89b7d89b13c82 /erts/epmd/src/epmd.c
parent661c42ab6f1b014e1988d0b33fda35d9e815ccdb (diff)
parentebcab38751aee5090093d38904c187d731f0670c (diff)
downloadotp-69764c865db61c0351be215f7f36947a71ef82f1.tar.gz
otp-69764c865db61c0351be215f7f36947a71ef82f1.tar.bz2
otp-69764c865db61c0351be215f7f36947a71ef82f1.zip
Merge branch 'sd/epmd-stop-cli' into dev
* sd/epmd-stop-cli: allow epmd -stop name to unregister a client from epmd
Diffstat (limited to 'erts/epmd/src/epmd.c')
-rw-r--r--erts/epmd/src/epmd.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index c509c49b39..6ddf30efe3 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -226,6 +226,12 @@ int main(int argc, char** argv)
else
usage(g);
epmd_cleanup_exit(g,0);
+ } else if (strcmp(argv[0], "-stop") == 0) {
+ if (argc == 2)
+ stop_cli(g, argv[1]);
+ else
+ usage(g);
+ epmd_cleanup_exit(g,0);
}
else
usage(g);
@@ -382,7 +388,7 @@ static void run_daemon(EpmdVars *g)
static void usage(EpmdVars *g)
{
fprintf(stderr, "usage: epmd [-d|-debug] [DbgExtra...] [-port No] [-daemon]\n");
- fprintf(stderr, " [-d|-debug] [-port No] [-names|-kill]\n\n");
+ fprintf(stderr, " [-d|-debug] [-port No] [-names|-kill|-stop name]\n\n");
fprintf(stderr, "See the Erlang epmd manual page for info about the usage.\n");
fprintf(stderr, "The -port and DbgExtra options are\n\n");
fprintf(stderr, " -port No\n");