X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Flttng.c;h=f568933650407693be890e636843effa77af0299;hp=379cbb1fdbb6183377bb4e50664d0c84bdb2a1e8;hb=3f5fa9ed7f1b26c152c7702a81ef77a40a2f1372;hpb=8490ae7b70872d03eda98f1fb2c76488a47e3084

diff --git a/lttng/lttng.c b/lttng/lttng.c
index 379cbb1fd..f56893365 100644
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -62,7 +62,6 @@ static struct cmd_struct commands[] =  {
 	{ "list", cmd_list},
 	{ "create", cmd_create},
 	{ "destroy", cmd_destroy},
-	{ "add-channel", cmd_add_channel},
 	{ "start", cmd_start},
 	{ "stop", cmd_stop},
 	{ "enable-event", cmd_enable_events},
@@ -91,7 +90,6 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "      --list-commands    Simple listing of lttng commands\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Commands:\n");
-	fprintf(ofp, "    add-channel     Add channel to tracer\n");
 	fprintf(ofp, "    add-context     Add context to event or/and channel\n");
 	fprintf(ofp, "    create          Create tracing session\n");
 	fprintf(ofp, "    destroy         Teardown tracing session\n");
@@ -338,8 +336,9 @@ static int check_sessiond(void)
 
 		/* Let's rock and roll */
 		if (pathname == NULL) {
-			ret = asprintf(&alloc_pathname, "ltt-sessiond");
+			ret = asprintf(&alloc_pathname, INSTALL_PATH "/ltt-sessiond");
 			if (ret < 0) {
+				perror("asprintf spawn sessiond");
 				goto end;
 			}
 			pathname = alloc_pathname;