X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=c171dfdfe41de54b126d8928a680c496e5890e18;hb=b967f1ccac529d100ba833d9cec9d655dccef154;hp=7f0b413bcbb789b83422255aad252e71c3b8e0d5;hpb=c3620799ca885f0749d275df8743a6d766670a2f;p=deliverable%2Flttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 7f0b413bc..c171dfdfe 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -374,6 +374,16 @@ end:
 	return ret;
 }
 
+static void parse_env_options(void)
+{
+	char *value = NULL;
+
+	value = lttng_secure_getenv(DEFAULT_LTTNG_RELAYD_WORKING_DIRECTORY_ENV);
+	if (value) {
+		opt_working_directory = value;
+	}
+}
+
 static int set_options(int argc, char **argv)
 {
 	int c, ret = 0, option_index = 0, retval = 0;
@@ -3156,7 +3166,13 @@ int main(int argc, char **argv)
 	int ret = 0, retval = 0;
 	void *status;
 
-	/* Parse arguments */
+	/* Parse environment variables */
+	parse_env_options();
+
+	/*
+	 * Parse arguments.
+	 * Command line arguments overwrite environment.
+	 */
 	progname = argv[0];
 	if (set_options(argc, argv)) {
 		retval = -1;