start: move env setup before container setup

The hooks (e.g. lxc.hook.mount) should have the environment variables the user
gave us available.

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

diff --git a/src/lxc/start.c b/src/lxc/start.c
index a2fbe0d38040d9a776e2aa7d417ae7942ee9912c..2186c75304c689c0f77cc6836cd0e6a71ca55ee1 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -913,6 +913,23 @@ static int do_start(void *data)
                INFO("Unshared CLONE_NEWCGROUP.");
        }
 
+       /* The clearenv() and putenv() calls have been moved here to allow us to
+        * use environment variables passed to the various hooks, such as the
+        * start hook above. Not all of the variables like CONFIG_PATH or ROOTFS
+        * are valid in this context but others are.
+        */
+       if (clearenv()) {
+               SYSERROR("Failed to clear environment.");
+               /* Don't error out though. */
+       }
+
+       lxc_list_for_each(iterator, &handler->conf->environment) {
+               if (putenv((char *)iterator->elem)) {
+                       SYSERROR("Failed to set environment variable: %s.", (char *)iterator->elem);
+                       goto out_warn_father;
+               }
+       }
+
        /* Setup the container, ip, names, utsname, ... */
        ret = lxc_setup(handler);
        close(handler->data_sock[0]);
@@ -962,35 +979,6 @@ static int do_start(void *data)
                goto out_warn_father;
        }
 
-       /* The clearenv() and putenv() calls have been moved here to allow us to
-        * use environment variables passed to the various hooks, such as the
-        * start hook above. Not all of the variables like CONFIG_PATH or ROOTFS
-        * are valid in this context but others are.
-        */
-       if (clearenv()) {
-               SYSERROR("Failed to clear environment.");
-               /* Don't error out though. */
-       }
-
-       lxc_list_for_each(iterator, &handler->conf->environment) {
-               if (putenv((char *)iterator->elem)) {
-                       SYSERROR("Failed to set environment variable: %s.", (char *)iterator->elem);
-                       goto out_warn_father;
-               }
-       }
-
-       if (putenv("container=lxc")) {
-               SYSERROR("Failed to set environment variable: container=lxc.");
-               goto out_warn_father;
-       }
-
-       if (handler->conf->pty_names) {
-               if (putenv(handler->conf->pty_names)) {
-                       SYSERROR("Failed to set environment variable for container ptys.");
-                       goto out_warn_father;
-               }
-       }
-
        close(handler->sigfd);
 
        if (devnull_fd < 0) {
@@ -1017,6 +1005,18 @@ static int do_start(void *data)
        if (lxc_sync_barrier_parent(handler, LXC_SYNC_CGROUP_LIMITS))
                goto out_warn_father;
 
+       if (putenv("container=lxc")) {
+               SYSERROR("Failed to set environment variable: container=lxc.");
+               goto out_warn_father;
+       }
+
+       if (handler->conf->pty_names) {
+               if (putenv(handler->conf->pty_names)) {
+                       SYSERROR("Failed to set environment variable for container ptys.");
+                       goto out_warn_father;
+               }
+       }
+
        /* The container has been setup. We can now switch to an unprivileged
         * uid/gid.
         */