use lxcpath as unprivileged containers log directory

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/src/lxc/log.c b/src/lxc/log.c
index d5b862e61a7f641e78bf549b952bf2f2c2bde028..b6b393157a6b2f571f95621819ba9b5ad2bf222a 100644 (file)
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -329,11 +329,6 @@ extern int lxc_log_init(const char *name, const char *file,
                        return 0;
                ret = __lxc_log_set_file(file, 1);
        } else {
-
-               /* For now, unprivileged containers have to set -l to get logging */
-               if (geteuid())
-                       return 0;
-
                /* if no name was specified, there nothing to do */
                if (!name)
                        return 0;
@@ -343,8 +338,8 @@ extern int lxc_log_init(const char *name, const char *file,
                if (!lxcpath)
                        lxcpath = LOGPATH;
 
-               /* try LOGPATH if lxcpath is the default */
-               if (strcmp(lxcpath, lxc_global_config_value("lxc.lxcpath")) == 0)
+               /* try LOGPATH if lxcpath is the default for the privileged containers */
+               if (!geteuid() && strcmp(lxcpath, lxc_global_config_value("lxc.lxcpath")) == 0)
                        ret = _lxc_log_set_file(name, NULL, 0);
 
                /* try in lxcpath */