start: preserve time namespace

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

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 16e519e993f0a9c110ec44c0419ba6d859c784c1..c49b249fb3578223ada67fff343c8adfdf02a22a 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1870,6 +1870,20 @@ static int lxc_spawn(struct lxc_handler *handler)
        cgroup_ops->payload_finalize(cgroup_ops);
        TRACE("Finished setting up cgroups");
 
+       if (handler->ns_clone_flags & CLONE_NEWTIME) {
+               /* Now we're ready to preserve the cgroup namespace */
+               ret = lxc_try_preserve_ns(handler->pid, "time");
+               if (ret < 0) {
+                       if (ret != -EOPNOTSUPP) {
+                               SYSERROR("Failed to preserve time namespace");
+                               goto out_delete_net;
+                       }
+               } else {
+                       handler->nsfd[LXC_NS_TIME] = ret;
+                       DEBUG("Preserved time namespace via fd %d", ret);
+               }
+       }
+
        /* Run any host-side start hooks */
        ret = run_lxc_hooks(name, "start-host", conf, NULL);
        if (ret < 0) {