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 1eb28f6fc1d240074f01f0643f844e81c8961864..b1b48185bdb5f3ae6132fd8027e2aea15ca54e78 100644 (file)
--- 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 f01ca2e84b1f6e63bc0070d73d15fa06c6b01043..bbdf141b2409825ee1b900453b2914ec03d7c9d3 100644 (file)
--- 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;