nesting: document how to enable nesting in container configurations

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 0861fa3a83e3ffb0fbdcde3b2626cd2387ea45f9..f361c3fcb5c5aedd251e4dfba7e6cdb548865b22 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -145,6 +145,7 @@ AM_CFLAGS=-I$(top_srcdir)/src \
        -DLXCINITDIR=\"$(LXCINITDIR)\" \
        -DLIBEXECDIR=\"$(LIBEXECDIR)\" \
        -DLXCTEMPLATEDIR=\"$(LXCTEMPLATEDIR)\" \
+       -DLXCTEMPLATECONFIG=\"$(LXCTEMPLATECONFIG)\" \
        -DLOGPATH=\"$(LOGPATH)\" \
        -DLXC_DEFAULT_CONFIG=\"$(LXC_DEFAULT_CONFIG)\" \
        -DLXC_USERNIC_DB=\"$(LXC_USERNIC_DB)\" \

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index bb34bcd809f76492f451e59c943d62902d6fe3ff..c11ffe064eeff0c784471971520a2542bce2e821 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1375,6 +1375,9 @@ static bool prepend_lxc_header(char *path, const char *t, char *const argv[])
        fprintf(f, "\n");
 #endif
        fprintf(f, "# For additional config options, please look at lxc.container.conf(5)\n");
+       fprintf(f, "\n# Uncomment the following line to support nesting containers:\n");
+       fprintf(f, "#lxc.include = " LXCTEMPLATECONFIG "/nesting.conf\n");
+       fprintf(f, "# (Be aware this has security implications)\n\n");
        if (fwrite(contents, 1, flen, f) != flen) {
                SYSERROR("Writing original contents");
                free(contents);