Merge pull request #585 from ptoomey3/lxc-execute-as-user

Add support for specified UID/GID for lxc-execute in a private user namespace

diff --cc doc/lxc.container.conf.sgml.in
Simple merge

diff --cc src/lxc/arguments.h
Simple merge

diff --cc src/lxc/conf.c
Simple merge

diff --cc src/lxc/confile.c
Simple merge

diff --cc src/lxc/lxc_execute.c
index d2c1248cd70b35b6ebb6d7cd053235176660d196,4f42236e3eebe6ef92bc12533783b8df12017de3..50d481f0e4e14a1365537b8ae76db5ffcd244c4f
--- 1/src/lxc/lxc_execute.c
--- 2/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@@ -79,9 -83,11 +83,11 @@@ lxc-execute creates a container with th
  and execs COMMAND into this container.\n\
  \n\
  Options :\n\
 -  -n, --name=NAME      NAME for name of the container\n\
 +  -n, --name=NAME      NAME of the container\n\
    -f, --rcfile=FILE    Load configuration file FILE\n\
-   -s, --define KEY=VAL Assign VAL to configuration variable KEY\n",
+   -s, --define KEY=VAL Assign VAL to configuration variable KEY\n\
+   -u, --uid=UID Execute COMMAND with UID inside the container\n\
+   -g, --gid=GID Execute COMMAND with GID inside the container\n",
        .options  = my_longopts,
        .parser   = my_parser,
        .checker  = my_checker,

diff --cc src/lxc/start.c
Simple merge