]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Merge pull request #1992 from lifeng68/add_init_cwd
authorChristian Brauner <christian.brauner@ubuntu.com>
Tue, 5 Dec 2017 04:53:23 +0000 (05:53 +0100)
committerGitHub <noreply@github.com>
Tue, 5 Dec 2017 04:53:23 +0000 (05:53 +0100)
confile:add lxc.init.cwd

1  2 
src/lxc/conf.c
src/lxc/conf.h

diff --cc src/lxc/conf.c
Simple merge
diff --cc src/lxc/conf.h
index f6c453a45a41329bff987be490c453829c50200b,fa10a41bfa0fae0d9990fd28f6c90e98b6ae30a9..43fc2b450947adb81f02032c811f2b6f3b77e080
@@@ -359,11 -359,12 +359,15 @@@ struct lxc_conf 
        struct lxc_cgroup cgroup_meta;
  
        char *inherit_ns[LXC_NS_MAX];
+       /* init working directory */
+        char* init_cwd;
  };
  
 +int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf,
 +                          size_t buf_size);
 +
  #ifdef HAVE_TLS
  extern __thread struct lxc_conf *current_config;
  #else