aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-11-14 10:39:05 +0100
committerGitHub <[email protected]>2018-11-14 10:39:05 +0100
commit4b9836a2dada60005e01067af04a0e0d9361fcee (patch)
tree81e6a066e3d5b517b1a1f652ad23ee52c6911aaf /erts
parent0acccc3289f45129d5e959455a73e834c7dfaf33 (diff)
parent1cb58055856a97cc1e6081539c37e50abbe23306 (diff)
downloadotp-4b9836a2dada60005e01067af04a0e0d9361fcee.tar.gz
otp-4b9836a2dada60005e01067af04a0e0d9361fcee.tar.bz2
otp-4b9836a2dada60005e01067af04a0e0d9361fcee.zip
Merge pull request #2017 from matwey/epmd-help
epmd: Move -systemd position in -help output
Diffstat (limited to 'erts')
-rw-r--r--erts/epmd/src/epmd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index 44e997e609..8313678b5d 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -437,6 +437,11 @@ static void usage(EpmdVars *g)
fprintf(stderr, " epmd -kill even if there "
"are registered nodes.\n");
fprintf(stderr, " Also allows forced unregister (epmd -stop).\n");
+#ifdef HAVE_SYSTEMD_DAEMON
+ fprintf(stderr, " -systemd\n");
+ fprintf(stderr, " Wait for socket from systemd. The option makes sense\n");
+ fprintf(stderr, " when started from .socket unit.\n");
+#endif /* HAVE_SYSTEMD_DAEMON */
fprintf(stderr, "\nDbgExtra options\n");
fprintf(stderr, " -packet_timeout Seconds\n");
fprintf(stderr, " Set the number of seconds a connection can be\n");
@@ -462,11 +467,6 @@ static void usage(EpmdVars *g)
fprintf(stderr, " Forcibly unregisters a name with epmd\n");
fprintf(stderr, " (only allowed if -relaxed_command_check was given when \n");
fprintf(stderr, " epmd was started).\n");
-#ifdef HAVE_SYSTEMD_DAEMON
- fprintf(stderr, " -systemd\n");
- fprintf(stderr, " Wait for socket from systemd. The option makes sense\n");
- fprintf(stderr, " when started from .socket unit.\n");
-#endif /* HAVE_SYSTEMD_DAEMON */
epmd_cleanup_exit(g,1);
}