Add minimal userns config for plamo

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/config/templates/Makefile.am b/config/templates/Makefile.am
index e864e1a227d833538da8aa6a9c9fe68b43fc9bd1..dd0dfa4bc32d168168f3028a47af3b876ac09e31 100644 (file)
--- a/config/templates/Makefile.am
+++ b/config/templates/Makefile.am
@@ -2,6 +2,7 @@ templatesconfigdir=@LXCTEMPLATECONFIG@
 
 templatesconfig_DATA = \
        plamo.common.conf \
+       plamo.userns.conf \
        ubuntu-cloud.common.conf \
        ubuntu-cloud.lucid.conf \
        ubuntu-cloud.userns.conf \

diff --git a/config/templates/plamo.userns.conf.in b/config/templates/plamo.userns.conf.in
new file mode 100644 (file)
index 0000000..330a2f0
--- /dev/null
+++ b/config/templates/plamo.userns.conf.in
@@ -0,0 +1,9 @@
+# CAP_SYS_ADMIN in init-user-ns is required for cgroup.devices
+lxc.cgroup.devices.deny =
+lxc.cgroup.devices.allow =
+
+# Extra bind-mounts for userns
+lxc.mount.entry = /dev/console dev/console none bind,create=file 0 0
+lxc.mount.entry = /dev/null dev/null none bind,create=file 0 0
+lxc.mount.entry = /dev/tty dev/tty none bind,create=file 0 0
+lxc.mount.entry = /dev/urandom dev/urandom none bind,create=file 0 0

diff --git a/configure.ac b/configure.ac
index e1536931d087c6c720cc59fcf165701d9962a50a..851426737ac1afa5254e3c3473e07e472d4d8e0e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -533,6 +533,7 @@ AC_CONFIG_FILES([
        config/etc/Makefile
        config/templates/Makefile
        config/templates/plamo.common.conf
+       config/templates/plamo.userns.conf
        config/templates/ubuntu-cloud.common.conf
        config/templates/ubuntu-cloud.lucid.conf
        config/templates/ubuntu-cloud.userns.conf