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

conf: make is_execute a boolean

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-05-26 12:50:03 +02:00
parent 3a0e314db5
commit 07c4ea310d
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lxc/conf.h
View File

@ -214,10 +214,10 @@ struct lxc_state_client {
struct lxc_conf { struct lxc_conf {
/* Pointer to the name of the container. Do not free! */ /* Pointer to the name of the container. Do not free! */
const char *name; const char *name;
int is_execute;
char *fstab; char *fstab;
unsigned int tty; unsigned int tty;
unsigned int pts; unsigned int pts;
bool is_execute;
int reboot; int reboot;
signed long personality; signed long personality;
struct utsname *utsname; struct utsname *utsname;

2
src/lxc/execute.c
View File

@ -152,7 +152,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"); TRACE("Doing lxc_execute");
handler->conf->is_execute = 1; handler->conf->is_execute = true;
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);
} }

2
src/lxc/start.c
View File

@ -1247,7 +1247,7 @@ static int do_start(void *data)
* make sure that that pty is stdin,stdout,stderr. * make sure that that pty is stdin,stdout,stderr.
*/ */
if (handler->conf->console.slave >= 0) { if (handler->conf->console.slave >= 0) {
if (handler->backgrounded || handler->conf->is_execute == 0) if (handler->backgrounded || !handler->conf->is_execute)
ret = set_stdfds(handler->conf->console.slave); ret = set_stdfds(handler->conf->console.slave);
else else
ret = lxc_terminal_set_stdfds(handler->conf->console.slave); ret = lxc_terminal_set_stdfds(handler->conf->console.slave);