Add common.conf.d

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/config/templates/Makefile.am b/config/templates/Makefile.am
index fdbf9d298a7f12b843895b5425025cf11b35e3dc..329f919b276e1ffa844b012a838f98e82c0972ad 100644 (file)
--- a/config/templates/Makefile.am
+++ b/config/templates/Makefile.am
@@ -2,6 +2,8 @@ templatesconfigdir=@LXCTEMPLATECONFIG@
 
 EXTRA_DIST = common.seccomp
 
+SUBDIRS = common.conf.d
+
 templatesconfig_DATA = \
        archlinux.common.conf \
        archlinux.userns.conf \

diff --git a/config/templates/common.conf.d/Makefile.am b/config/templates/common.conf.d/Makefile.am
new file mode 100644 (file)
index 0000000..b974249
--- /dev/null
+++ b/config/templates/common.conf.d/Makefile.am
@@ -0,0 +1,6 @@
+templatesconfigdir=@LXCTEMPLATECONFIG@/common.conf.d/
+
+EXTRA_DIST = README
+
+templatesconfig_DATA = \
+       README

diff --git a/config/templates/common.conf.d/README b/config/templates/common.conf.d/README
new file mode 100644 (file)
index 0000000..f7e7c22
--- /dev/null
+++ b/config/templates/common.conf.d/README
@@ -0,0 +1,6 @@
+This directory can be used by packages and users to dump LXC
+configuration snippets which will then be used by all containers using
+the common.conf configuration file (directly or indirectly).
+
+Configuration files must end with the .conf suffix and LXC will include
+those in alphabetical order.

diff --git a/config/templates/common.conf.in b/config/templates/common.conf.in
index f01db082e039362278e467eda9233bd49b90e08b..f22ef0c1fd875c325c625208edcaf0920d9a31dc 100644 (file)
--- a/config/templates/common.conf.in
+++ b/config/templates/common.conf.in
@@ -46,3 +46,6 @@ lxc.cgroup.devices.allow = c 136:* rwm
 # Blacklist some syscalls which are not safe in privileged
 # containers
 lxc.seccomp = @LXCTEMPLATECONFIG@/common.seccomp
+
+# Lastly, include all the configs from @LXCTEMPLATECONFIG@/common.conf.d/
+lxc.include = @LXCTEMPLATECONFIG@/common.conf.d/

diff --git a/configure.ac b/configure.ac
index 09cf9e22af351f44d7a3c563dea12a47ca07f0b7..f0605a8894a202d4d1806770ca4cc4748c512910 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -627,6 +627,7 @@ AC_CONFIG_FILES([
        config/templates/centos.common.conf
        config/templates/centos.userns.conf
        config/templates/common.conf
+       config/templates/common.conf.d/Makefile
        config/templates/debian.common.conf
        config/templates/debian.userns.conf
        config/templates/fedora.common.conf