Merge pull request #596 from lazy404/master

Only use LOGPATH if lxcpath is unset or default

Merge pull request #596 from lazy404/master
3cd05817 · Stéphane Graber · 61f619ba · 479bba8b · 3cd05817
Commit 3cd05817 authored Aug 13, 2015 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

log.c src/lxc/log.c +1 -1

No files found.
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -356,7 +356,7 @@ extern int lxc_log_init(const char *name, const char *file,
 			lxcpath = LOGPATH;

 		/* try LOGPATH if lxcpath is the default for the privileged containers */
-		if (!geteuid() && strcmp(lxcpath, lxc_global_config_value("lxc.lxcpath")) == 0)
+		if (!geteuid() && strcmp(LXCPATH, lxcpath) == 0)
 			ret = _lxc_log_set_file(name, NULL, 0);

 		/* try in lxcpath */