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>

Add extra debugging
c08220e9 · Micahel J. Evans · Stéphane Graber · a9ae28a0 · c08220e9 · c08220e9
Commit c08220e9 authored Jul 10, 2014 by Micahel J. Evans Committed by Stéphane Graber Aug 15, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

namespace.c src/lxc/namespace.c +1 -1

start.c src/lxc/start.c +4 -1

No files found.
--- 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;
 }

--- 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) {