lxc-oracle: mount cgroup:mixed

- Mounting cgroup:mixed prevents systemd inside the container from moving its children out of the cgroups lxc setup. This ensure the limits setup in the configuration or with lxc-cgroup are effective. - Update for the OL7 channel name that will be used on public-yum.oracle.com. Signed-off-by: Dwight Engen <dwight.engen@oracle.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

lxc-oracle: mount cgroup:mixed
6000d5ba · Dwight Engen · Stéphane Graber · d4ef230c · 6000d5ba · 6000d5ba
Commit 6000d5ba authored Jul 03, 2014 by Dwight Engen Committed by Stéphane Graber Jul 03, 2014
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

oracle.common.conf.in config/templates/oracle.common.conf.in +1 -1

lxc-oracle.in templates/lxc-oracle.in +3 -1

No files found.
--- a/config/templates/oracle.common.conf.in
+++ b/config/templates/oracle.common.conf.in
@@ -2,7 +2,7 @@
 lxc.include = @LXCTEMPLATECONFIG@/common.conf
 # Mount entries
-lxc.mount.auto = proc:mixed sys:ro
+lxc.mount.auto = cgroup:mixed proc:mixed sys:ro
 # Capabilities
 # Uncomment these if you don't run anything that needs the capability, and

--- a/templates/lxc-oracle.in
+++ b/templates/lxc-oracle.in
@@ -658,7 +658,9 @@ container_rootfs_create()
            # disable all repos, then enable the repo for the version we are installing.
            if [ $container_release_minor = "latest" ]; then
                repo=$latest_L""$container_release_major"_"$container_release_minor
-            elif [ $container_release_major = "6" -o  $container_release_major = "7" ]; then
+            elif [ $container_release_major = "7" ]; then
+                    repo="ol"$container_release_major"_u"$container_release_minor"_base"
+            elif [ $container_release_major = "6" ]; then
                if   [ $container_release_minor = "0" ]; then
                    repo="ol"$container_release_major"_ga_base"
                else