X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=7ac5630fb9790262b7355df43f7066deadfb671b;hp=506bbc6fb87249fe933cab9be2dfadb7f0a11d1c;hb=b5218ffbf53aa46007927f1e2cda0ad4549abcf9;hpb=9ad42ec1800b074488873ec43d91c73ce9c9dfcf

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 506bbc6fb..7ac5630fb 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -63,7 +63,7 @@
 
 /* command line options */
 char *opt_output_path;
-static int opt_daemon;
+static int opt_daemon, opt_background;
 static struct lttng_uri *control_uri;
 static struct lttng_uri *data_uri;
 static struct lttng_uri *live_uri;
@@ -131,6 +131,7 @@ static struct option long_options[] = {
 	{ "data-port", 1, 0, 'D', },
 	{ "live-port", 1, 0, 'L', },
 	{ "daemonize", 0, 0, 'd', },
+	{ "background", 0, 0, 'b', },
 	{ "group", 1, 0, 'g', },
 	{ "help", 0, 0, 'h', },
 	{ "output", 1, 0, 'o', },
@@ -150,6 +151,7 @@ void usage(void)
 	fprintf(stderr, "Usage: %s OPTIONS\n\nOptions:\n", progname);
 	fprintf(stderr, "  -h, --help                Display this usage.\n");
 	fprintf(stderr, "  -d, --daemonize           Start as a daemon.\n");
+	fprintf(stderr, "  -b, --background          Start as a daemon, keeping console open.\n");
 	fprintf(stderr, "  -C, --control-port URL    Control port listening.\n");
 	fprintf(stderr, "  -D, --data-port URL       Data port listening.\n");
 	fprintf(stderr, "  -L, --live-port URL       Live view port listening.\n");
@@ -210,6 +212,9 @@ int set_option(int opt, const char *arg, const char *optname)
 	case 'd':
 		opt_daemon = 1;
 		break;
+	case 'b':
+		opt_background = 1;
+		break;
 	case 'g':
 		tracing_group_name = strdup(arg);
 		tracing_group_name_override = 1;
@@ -2847,8 +2852,8 @@ int main(int argc, char **argv)
 	}
 
 	/* Daemonize */
-	if (opt_daemon) {
-		ret = daemon(0, 0);
+	if (opt_daemon || opt_background) {
+		ret = daemon(0, opt_background);
 		if (ret < 0) {
 			PERROR("daemon");
 			goto exit;