Add common.conf.d

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 \

config/templates/common.conf.d/Makefile.am

+templatesconfigdir=@LXCTEMPLATECONFIG@/common.conf.d/
+
+EXTRA_DIST = README
+
+templatesconfig_DATA = \
+	README

config/templates/common.conf.d/README

+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.

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/

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