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

Merge pull request #2308 from tych0/add-logging

Browse Source 
fix execute when init in the container already exists
This commit is contained in:
Serge Hallyn 2018-05-09 09:50:31 -05:00 committed by GitHub
commit 0f1b40e259
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/conf.c
View File

@ -3213,8 +3213,15 @@ static int lxc_execute_bind_init(struct lxc_handler *handler)
/* If init exists in the container, don't bind mount a static one */ /* If init exists in the container, don't bind mount a static one */
p = choose_init(conf->rootfs.mount); p = choose_init(conf->rootfs.mount);
if (p) { if (p) {
free(p); char *old = p;
return 0;
p = strdup(old + strlen(conf->rootfs.mount));
free(old);
if (!p)
return -ENOMEM;
INFO("Found existing init at \"%s\"", p);
goto out;
} }
ret = snprintf(path, PATH_MAX, SBINDIR "/init.lxc.static"); ret = snprintf(path, PATH_MAX, SBINDIR "/init.lxc.static");
@ -3247,9 +3254,10 @@ static int lxc_execute_bind_init(struct lxc_handler *handler)
p = strdup(destpath + strlen(conf->rootfs.mount)); p = strdup(destpath + strlen(conf->rootfs.mount));
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
((struct execute_args *)handler->data)->init_path = p;
INFO("Bind mounted lxc.init.static into container at \"%s\"", path); INFO("Bind mounted lxc.init.static into container at \"%s\"", path);
out:
((struct execute_args *)handler->data)->init_path = p;
return 0; return 0;
} }

16
src/lxc/execute.c
View File

@ -57,12 +57,19 @@ static int execute_start(struct lxc_handler *handler, void* data)
if (lxc_log_has_valid_level()) if (lxc_log_has_valid_level())
argc_add += 2; argc_add += 2;
argv = malloc((argc + argc_add) * sizeof(*argv)); if (current_config->logfd != -1 || lxc_log_fd != -1)
if (!argv) argc_add += 2;
goto out1;
if (!my_args->init_path) argv = malloc((argc + argc_add) * sizeof(*argv));
if (!argv) {
SYSERROR("Allocating init args failed");
goto out1;
}
if (!my_args->init_path) {
ERROR("Init path missing");
goto out2; goto out2;
}
argv[i++] = my_args->init_path; argv[i++] = my_args->init_path;
@ -139,6 +146,7 @@ int lxc_execute(const char *name, char *const argv[], int quiet,
{ {
struct execute_args args = {.argv = argv, .quiet = quiet}; struct execute_args args = {.argv = argv, .quiet = quiet};
TRACE("Doing lxc_execute");
handler->conf->is_execute = 1; handler->conf->is_execute = 1;
return __lxc_start(name, handler, &execute_start_ops, &args, lxcpath, return __lxc_start(name, handler, &execute_start_ops, &args, lxcpath,
backgrounded, error_num); backgrounded, error_num);

1
src/lxc/start.c
View File

@ -1971,6 +1971,7 @@ int lxc_start(const char *name, char *const argv[], struct lxc_handler *handler,
.argv = argv, .argv = argv,
}; };
TRACE("Doing lxc_start");
return __lxc_start(name, handler, &start_ops, &start_arg, lxcpath, backgrounded, error_num); return __lxc_start(name, handler, &start_ops, &start_arg, lxcpath, backgrounded, error_num);
} }