conf: make is_execute a boolean

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index c4ae2324d5bba813d3c590debaf19a8b60095cf2..758b3666732a8821eeaaaaf1ac04e61920df93b3 100644 (file)
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -214,10 +214,10 @@ struct lxc_state_client {
 struct lxc_conf {
        /* Pointer to the name of the container. Do not free! */
        const char *name;
-       int is_execute;
        char *fstab;
        unsigned int tty;
        unsigned int pts;
+       bool is_execute;
        int reboot;
        signed long personality;
        struct utsname *utsname;

diff --git a/src/lxc/execute.c b/src/lxc/execute.c
index d895e5be90f467faf3b4918437062573632b21f7..1a87b2321b6c2248b18936638cacf606ad11716d 100644 (file)
--- a/src/lxc/execute.c
+++ b/src/lxc/execute.c
@@ -152,7 +152,7 @@ int lxc_execute(const char *name, char *const argv[], int quiet,
        struct execute_args args = {.argv = argv, .quiet = quiet};
 
        TRACE("Doing lxc_execute");
-       handler->conf->is_execute = 1;
+       handler->conf->is_execute = true;
        return __lxc_start(name, handler, &execute_start_ops, &args, lxcpath,
                           backgrounded, error_num);
 }

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 94abff3776a0cb999661996b4fdb8792fccd3836..21a1140e6b699bc2e9d38830caa0433b780801d7 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1247,7 +1247,7 @@ static int do_start(void *data)
         * make sure that that pty is stdin,stdout,stderr.
         */
         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);
                 else
                         ret = lxc_terminal_set_stdfds(handler->conf->console.slave);