[lxc-devel] [lxc/master] conf: record idmap that gets written

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 406 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170905/bfa4d729/attachment.bin>
-------------- next part --------------
From 54fbbeb573f307711ce21f819c62159f1c0f5b83 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Tue, 5 Sep 2017 02:00:29 +0200
Subject: [PATCH] conf: record idmap that gets written

This will serve us well in the future!

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/lxc/conf.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index a7ae90a1d..ea166c1de 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2594,14 +2594,19 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
 					  lxc_map_ids_exec_wrapper,
 					  (void *)mapbuf);
 			if (ret < 0) {
-				ERROR("new%cidmap failed to write mapping: %s",
-				      u_or_g, cmd_output);
+				ERROR("new%cidmap failed to write mapping \"%s\": %s",
+				      u_or_g, cmd_output, mapbuf);
 				return -1;
 			}
+			TRACE("new%cidmap wrote mapping \"%s\"", u_or_g, mapbuf);
 		} else {
 			ret = write_id_mapping(type, pid, mapbuf, pos - mapbuf);
-			if (ret < 0)
+			if (ret < 0) {
+				ERROR("Failed to write mapping \"%s\": %s",
+				      cmd_output, mapbuf);
 				return -1;
+			}
+			TRACE("Wrote mapping \"%s\"", mapbuf);
 		}
 
 		memset(mapbuf, 0, sizeof(mapbuf));