Add extra debugging

This is an hybrid between Micahel's original patch and me making the new
debugging statements look like our existing ones.

Signed-off-by: "Micahel J. Evans" <mjevans1983@gmail.com>
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/src/lxc/namespace.c b/src/lxc/namespace.c
index 31d4e7204b293cf9390b6f6a7b642d4927c88c68..19b6593fd223cc5202086f9e6232c1119f9a63ce 100644 (file)
--- a/src/lxc/namespace.c
+++ b/src/lxc/namespace.c
@@ -64,7 +64,7 @@ pid_t lxc_clone(int (*fn)(void *), void *arg, int flags)
        ret = clone(do_clone, stack  + stack_size, flags | SIGCHLD, &clone_arg);
 #endif
        if (ret < 0)
-               ERROR("failed to clone(0x%x): %s", flags, strerror(errno));
+               ERROR("failed to clone (%#x): %s", flags, strerror(errno));
 
        return ret;
 }

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 6c7ac6ab8f5ac66bef54863e1338cd107e9cde40..584049e87f32c96c91f7cea85a94114e34874597 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -548,7 +548,10 @@ static int must_drop_cap_sys_boot(struct lxc_conf *conf)
        pid = clone(container_reboot_supported, stack, flags, &cmd);
 #endif
        if (pid < 0) {
-               SYSERROR("failed to clone");
+               if (flags & CLONE_NEWUSER)
+                       ERRROR("failed to clone (%#x): %s (includes CLONE_NEWUSER)", flags, strerror(errno));
+               else
+                       ERRROR("failed to clone (%#x): %s", flags, strerror(errno));
                return -1;
        }
        if (wait(&status) < 0) {