lxccontainer: fix mount api (mount_injection_file)

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

diff --git a/src/lxc/api_extensions.h b/src/lxc/api_extensions.h
index 226567f6651c77848333fb6cfcb6557c7ec7e797..810d39828530d6b52eae6b317b37b97870718be7 100644 (file)
--- a/src/lxc/api_extensions.h
+++ b/src/lxc/api_extensions.h
@@ -40,6 +40,7 @@ static char *api_extensions[] = {
        "reboot2",
        "mount_injection",
        "cgroup_relative",
+       "mount_injection_file",
 };
 
 static size_t nr_api_extensions = sizeof(api_extensions) / sizeof(*api_extensions);

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index a7f29838aaaea34acd87c1512b51c0317d674a17..1e5e6ad05aa5cdcb9e0915c4ddbefc339dde7a14 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -5045,10 +5045,13 @@ static int do_lxcapi_mount(struct lxc_container *c, const char *source,
 
                /* Enter the container namespaces */
                if (!lxc_list_empty(&c->lxc_conf->id_map)) {
-                       if (!switch_to_ns(init_pid, "user")){
+                       if (!switch_to_ns(init_pid, "user")) {
                                ERROR("Failed to enter user namespace");
                                _exit(EXIT_FAILURE);
                        }
+
+                       if (!lxc_switch_uid_gid(0, 0))
+                               _exit(EXIT_FAILURE);
                }
 
                if (!switch_to_ns(init_pid, "mnt")) {