- 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 <[email protected]> --- config/templates/oracle.common.conf.in | 2 +- templates/lxc-oracle.in | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/templates/oracle.common.conf.in b/config/templates/oracle.common.conf.in index ec5ae94..10522b2 100644 --- 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 diff --git a/templates/lxc-oracle.in b/templates/lxc-oracle.in index 7a704e6..830ce5c 100644 --- 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 -- 1.9.3 _______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
