conf: record idmap that gets written

This will serve us well in the future! Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

conf: record idmap that gets written
567d7611 · Christian Brauner · 9d6c5eff · 567d7611
Unverified Commit 567d7611 authored Sep 05, 2017 by Christian Brauner
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

conf.c src/lxc/conf.c +8 -3

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2515,15 +2515,20 @@ 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",
+				ERROR("new%cidmap failed to write mapping \"%s\": %s",
-				      u_or_g, cmd_output);
+				      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));
 	}