Prefer using the native consumer over 32-bit consumer for kernel

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 86112f4735eb0d49dc6c93cc9cd91d7e223a677a..a153b2351cccae5d2b125d23e8a088bd0c2d52af 100644 (file)
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -1533,10 +1533,10 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
                         */
                        if (stat(consumerd64_bin, &st) == 0) {
                                consumer_to_use = consumerd64_bin;
                         */
                        if (stat(consumerd64_bin, &st) == 0) {
                                consumer_to_use = consumerd64_bin;

-                       } else if (stat(consumerd32_bin, &st) == 0) {
-                               consumer_to_use = consumerd32_bin;

                        } else if (stat(INSTALL_BIN_PATH "/" CONSUMERD_FILE, &st) == 0) {
                                consumer_to_use = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
                        } else if (stat(INSTALL_BIN_PATH "/" CONSUMERD_FILE, &st) == 0) {
                                consumer_to_use = INSTALL_BIN_PATH "/" CONSUMERD_FILE;

+                       } else if (stat(consumerd32_bin, &st) == 0) {
+                               consumer_to_use = consumerd32_bin;

                        } else {
                                break;
                        }
                        } else {
                                break;
                        }