proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-18 09:14:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

start: set loglevel correctly

Browse Source 
We want the loglevel that the user specified when starting the container
because it overrides the default one set in the config.

Closes #2003.

Reported-by: Felix Abecassis <fabecassis@nvidia.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2017-12-06 00:16:38 +01:00
parent b10fdf6b71
commit 4a03ded4b2
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/start.c
View File

@ -572,6 +572,7 @@ on_error:
int lxc_init(const char *name, struct lxc_handler *handler) int lxc_init(const char *name, struct lxc_handler *handler)
{ {
const char *loglevel;
struct lxc_conf *conf = handler->conf; struct lxc_conf *conf = handler->conf;
lsm_init(); lsm_init();
@ -612,8 +613,9 @@ int lxc_init(const char *name, struct lxc_handler *handler)
if (setenv("LXC_CGNS_AWARE", "1", 1)) if (setenv("LXC_CGNS_AWARE", "1", 1))
SYSERROR("Failed to set environment variable LXC_CGNS_AWARE=1."); SYSERROR("Failed to set environment variable LXC_CGNS_AWARE=1.");
if (setenv("LXC_LOG_LEVEL", lxc_log_priority_to_string(handler->conf->loglevel), 1)) loglevel = lxc_log_priority_to_string(lxc_log_get_level());
SYSERROR("Failed to set environment variable LXC_CGNS_AWARE=1."); if (setenv("LXC_LOG_LEVEL", loglevel, 1))
SYSERROR("Failed to set environment variable LXC_LOG_LEVEL=%s", loglevel);
/* End of environment variable setup for hooks. */ /* End of environment variable setup for hooks. */
TRACE("set environment variables"); TRACE("set environment variables");