start: don't unconditionally open("/dev/null")

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

diff --git a/src/lxc/start.c b/src/lxc/start.c
index a12e2ecfd6778506b0464df9264c908b96ea471f..209904c01fae3d0840040204132cdf2022411602 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1287,23 +1287,18 @@ static int do_start(void *data)
 
        close(handler->sigfd);
 
-       if (devnull_fd < 0) {
-               devnull_fd = open_devnull();
-
-               if (devnull_fd < 0)
-                       goto out_warn_father;
-       }
+       if (handler->conf->console.slave < 0 && handler->backgrounded) {
+               if (devnull_fd < 0) {
+                       devnull_fd = open_devnull();
+                       if (devnull_fd < 0)
+                               goto out_warn_father;
+               }
 
-       if (handler->conf->console.slave < 0 && handler->backgrounded)
-               if (set_stdfds(devnull_fd) < 0) {
-                       ERROR("Failed to redirect std{in,out,err} to "
-                             "\"/dev/null\"");
+               ret = set_stdfds(devnull_fd);
+               if (ret < 0) {
+                       ERROR("Failed to redirect std{in,out,err} to \"/dev/null\"");
                        goto out_warn_father;
                }
-
-       if (devnull_fd >= 0) {
-               close(devnull_fd);
-               devnull_fd = -1;
        }
 
        setsid();