From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 29 Jun 2020 21:29:03 +0000 (-0400)
Subject: Fix: kernel metadata file outside of kernel/ directory
X-Git-Tag: v2.11.5~14
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=8b3be07a094ad88c73990d5c945ac1b24582f479

Fix: kernel metadata file outside of kernel/ directory

3ef395a9, a backport of a2814ea, introduces a regression that
causes the kernel trace metadata file to be created outside of
the "kernel" domain sub-directory.

master and stable-2.12 no longer need the domain sub-directory
to be passed to the consumer daemon. However, it was still used
in the 2.11 release.

Fixes #1275

Reported-by: Christophe Bedard <bedard.christophe@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I1fe10ddd414cc87264b5e6d6a6d81e45ebc800d4
---

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index a3295e927..f6eb497b6 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -231,7 +231,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 	consumer_init_add_channel_comm_msg(&lkm,
 			ksession->metadata->key,
 			ksession->id,
-			"",
+			DEFAULT_KERNEL_TRACE_DIR,
 			ksession->uid,
 			ksession->gid,
 			consumer->net_seq_index,