From 2a51cda97be376aa956b0c770b9f11afe0d4562d Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Fri, 19 Sep 2014 16:33:32 -0400 Subject: [PATCH] Discontinue the use of in-line comments (stable) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Those aren't supported, it's just a lucky coincidence that they weren't causing problems. Signed-off-by: Stéphane Graber Acked-by: Serge E. Hallyn --- config/templates/centos.common.conf.in | 24 ++++++++++++++++-------- config/templates/fedora.common.conf.in | 24 ++++++++++++++++-------- config/templates/oracle.common.conf.in | 24 ++++++++++++++++-------- 3 files changed, 48 insertions(+), 24 deletions(-) diff --git a/config/templates/centos.common.conf.in b/config/templates/centos.common.conf.in index b80585fb1..5e880a202 100644 --- a/config/templates/centos.common.conf.in +++ b/config/templates/centos.common.conf.in @@ -37,14 +37,22 @@ lxc.cgroup.devices.deny = a # Allow any mknod (but not reading/writing the node) lxc.cgroup.devices.allow = c *:* m lxc.cgroup.devices.allow = b *:* m -lxc.cgroup.devices.allow = c 1:3 rwm # /dev/null -lxc.cgroup.devices.allow = c 1:5 rwm # /dev/zero -lxc.cgroup.devices.allow = c 1:7 rwm # /dev/full -lxc.cgroup.devices.allow = c 5:0 rwm # /dev/tty -lxc.cgroup.devices.allow = c 1:8 rwm # /dev/random -lxc.cgroup.devices.allow = c 1:9 rwm # /dev/urandom -lxc.cgroup.devices.allow = c 136:* rwm # /dev/tty[1-4] ptys and lxc console -lxc.cgroup.devices.allow = c 5:2 rwm # /dev/ptmx pty master +## /dev/null +lxc.cgroup.devices.allow = c 1:3 rwm +## /dev/zero +lxc.cgroup.devices.allow = c 1:5 rwm +## /dev/full +lxc.cgroup.devices.allow = c 1:7 rwm +## /dev/tty +lxc.cgroup.devices.allow = c 5:0 rwm +## /dev/random +lxc.cgroup.devices.allow = c 1:8 rwm +## /dev/urandom +lxc.cgroup.devices.allow = c 1:9 rwm +## /dev/tty[1-4] ptys and lxc console +lxc.cgroup.devices.allow = c 136:* rwm +## /dev/ptmx pty master +lxc.cgroup.devices.allow = c 5:2 rwm # Blacklist some syscalls which are not safe in privileged # containers diff --git a/config/templates/fedora.common.conf.in b/config/templates/fedora.common.conf.in index add0859ec..49c6ac6f6 100644 --- a/config/templates/fedora.common.conf.in +++ b/config/templates/fedora.common.conf.in @@ -39,14 +39,22 @@ lxc.cgroup.devices.deny = a # Allow any mknod (but not reading/writing the node) lxc.cgroup.devices.allow = c *:* m lxc.cgroup.devices.allow = b *:* m -lxc.cgroup.devices.allow = c 1:3 rwm # /dev/null -lxc.cgroup.devices.allow = c 1:5 rwm # /dev/zero -lxc.cgroup.devices.allow = c 1:7 rwm # /dev/full -lxc.cgroup.devices.allow = c 5:0 rwm # /dev/tty -lxc.cgroup.devices.allow = c 1:8 rwm # /dev/random -lxc.cgroup.devices.allow = c 1:9 rwm # /dev/urandom -lxc.cgroup.devices.allow = c 136:* rwm # /dev/tty[1-4] ptys and lxc console -lxc.cgroup.devices.allow = c 5:2 rwm # /dev/ptmx pty master +## /dev/null +lxc.cgroup.devices.allow = c 1:3 rwm +## /dev/zero +lxc.cgroup.devices.allow = c 1:5 rwm +## /dev/full +lxc.cgroup.devices.allow = c 1:7 rwm +## /dev/tty +lxc.cgroup.devices.allow = c 5:0 rwm +## /dev/random +lxc.cgroup.devices.allow = c 1:8 rwm +## /dev/urandom +lxc.cgroup.devices.allow = c 1:9 rwm +## /dev/tty[1-4] ptys and lxc console +lxc.cgroup.devices.allow = c 136:* rwm +## /dev/ptmx pty master +lxc.cgroup.devices.allow = c 5:2 rwm # Blacklist some syscalls which are not safe in privileged # containers diff --git a/config/templates/oracle.common.conf.in b/config/templates/oracle.common.conf.in index 1b30fe977..cf6ad6845 100644 --- a/config/templates/oracle.common.conf.in +++ b/config/templates/oracle.common.conf.in @@ -35,14 +35,22 @@ lxc.cgroup.devices.deny = a # Allow any mknod (but not reading/writing the node) lxc.cgroup.devices.allow = c *:* m lxc.cgroup.devices.allow = b *:* m -lxc.cgroup.devices.allow = c 1:3 rwm # /dev/null -lxc.cgroup.devices.allow = c 1:5 rwm # /dev/zero -lxc.cgroup.devices.allow = c 1:7 rwm # /dev/full -lxc.cgroup.devices.allow = c 5:0 rwm # /dev/tty -lxc.cgroup.devices.allow = c 1:8 rwm # /dev/random -lxc.cgroup.devices.allow = c 1:9 rwm # /dev/urandom -lxc.cgroup.devices.allow = c 136:* rwm # /dev/tty[1-4] ptys and lxc console -lxc.cgroup.devices.allow = c 5:2 rwm # /dev/ptmx pty master +## /dev/null +lxc.cgroup.devices.allow = c 1:3 rwm +## /dev/zero +lxc.cgroup.devices.allow = c 1:5 rwm +## /dev/full +lxc.cgroup.devices.allow = c 1:7 rwm +## /dev/tty +lxc.cgroup.devices.allow = c 5:0 rwm +## /dev/random +lxc.cgroup.devices.allow = c 1:8 rwm +## /dev/urandom +lxc.cgroup.devices.allow = c 1:9 rwm +## /dev/tty[1-4] ptys and lxc console +lxc.cgroup.devices.allow = c 136:* rwm +## /dev/ptmx pty master +lxc.cgroup.devices.allow = c 5:2 rwm # Blacklist some syscalls which are not safe in privileged # containers -- 2.47.2