From: David Goulet <dgoulet@efficios.com>
Date: Wed, 29 Jan 2014 17:34:28 +0000 (-0500)
Subject: Fix: add -b, --background option
X-Git-Tag: v2.4.0-rc4~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=06b55dbbd4ce78bc7a3aad8a811ecb23c9f02862;p=lttng-tools.git

Fix: add -b, --background option

This was removed during a merge from master by mistake.

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 1eb28f6fc..b1b48185b 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -166,12 +166,13 @@ int parse_args(int argc, char **argv)
 		{ "help", 0, 0, 'h', },
 		{ "output", 1, 0, 'o', },
 		{ "verbose", 0, 0, 'v', },
+		{ "background", 0, 0, 'b' },
 		{ NULL, 0, 0, 0, },
 	};
 
 	while (1) {
 		int option_index = 0;
-		c = getopt_long(argc, argv, "dhv" "C:D:L:o:g:",
+		c = getopt_long(argc, argv, "dhv" "C:D:L:o:g:b",
 				long_options, &option_index);
 		if (c == -1) {
 			break;
@@ -217,6 +218,9 @@ int parse_args(int argc, char **argv)
 		case 'd':
 			opt_daemon = 1;
 			break;
+		case 'b':
+			opt_background = 1;
+			break;
 		case 'g':
 			tracing_group_name = optarg;
 			break;
diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index f01ca2e84..bbdf141b2 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -4021,12 +4021,13 @@ static int parse_args(int argc, char **argv)
 		{ "no-kernel", 0, 0, 'N' },
 		{ "pidfile", 1, 0, 'p' },
 		{ "jul-tcp-port", 1, 0, 'J' },
+		{ "background", 0, 0, 'b' },
 		{ NULL, 0, 0, 0 }
 	};
 
 	while (1) {
 		int option_index = 0;
-		c = getopt_long(argc, argv, "dhqvVSN" "a:c:g:s:C:E:D:F:Z:u:t:p:J:",
+		c = getopt_long(argc, argv, "dhqvVSN" "a:c:g:s:C:E:D:F:Z:u:t:p:J:b",
 				long_options, &option_index);
 		if (c == -1) {
 			break;
@@ -4048,6 +4049,9 @@ static int parse_args(int argc, char **argv)
 		case 'd':
 			opt_daemon = 1;
 			break;
+		case 'b':
+			opt_background = 1;
+			break;
 		case 'g':
 			tracing_group_name = optarg;
 			break;