On 11/14/2012 12:03 PM, Dwight Engen wrote: > The kernel config option for the memory cgroup was changed in 3.6 > from CONFIG_CGROUP_MEM_RES_CTLR to CONFIG_MEMCG with commit c255a458. > > Signed-off-by: Dwight Engen <dwight.en...@oracle.com>
Sorry for the delay, I somehow missed that one.
Acked-by: Stéphane Graber <stgra...@ubuntu.com>
Pushed to staging. Thanks.
> ---
> src/lxc/lxc-checkconfig.in | 25 +++++++++++++++----------
> 1 files changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/src/lxc/lxc-checkconfig.in b/src/lxc/lxc-checkconfig.in
> index 8c2b5e5..8263c17 100644
> --- a/src/lxc/lxc-checkconfig.in
> +++ b/src/lxc/lxc-checkconfig.in
> @@ -68,6 +68,15 @@ print_cgroups() {
> }
>
> CGROUP_MNT_PATH=`print_cgroups cgroup /proc/self/mounts | head -1`
> +KVER_MAJOR=$($GREP '^# Linux' $CONFIG | \
> + sed -r 's/.* ([0-9])\.[0-9]{1,2}\.[0-9]{1,3}.*/\1/')
> +if [[ $KVER_MAJOR == 2 ]]; then
> +KVER_MINOR=$($GREP '^# Linux' $CONFIG | \
> + sed -r 's/.* 2.6.([0-9]{2}).*/\1/')
> +else
> +KVER_MINOR=$($GREP '^# Linux' $CONFIG | \
> + sed -r 's/.* [0-9]\.([0-9]{1,3})\.[0-9]{1,3}.*/\1/')
> +fi
>
> echo -n "Cgroup: " && is_enabled CONFIG_CGROUPS yes
>
> @@ -80,22 +89,18 @@ fi
> echo -n "Cgroup device: " && is_enabled CONFIG_CGROUP_DEVICE
> echo -n "Cgroup sched: " && is_enabled CONFIG_CGROUP_SCHED
> echo -n "Cgroup cpu account: " && is_enabled CONFIG_CGROUP_CPUACCT
> -echo -n "Cgroup memory controller: " && is_enabled CONFIG_CGROUP_MEM_RES_CTLR
> +echo -n "Cgroup memory controller: "
> +if [ $KVER_MAJOR -ge 3 -a $KVER_MINOR -ge 6 ]; then
> + is_enabled CONFIG_MEMCG
> +else
> + is_enabled CONFIG_CGROUP_MEM_RES_CTLR
> +fi
> is_set CONFIG_SMP && echo -n "Cgroup cpuset: " && is_enabled CONFIG_CPUSETS
> echo
> echo "--- Misc ---"
> echo -n "Veth pair device: " && is_enabled CONFIG_VETH
> echo -n "Macvlan: " && is_enabled CONFIG_MACVLAN
> echo -n "Vlan: " && is_enabled CONFIG_VLAN_8021Q
> -KVER_MAJOR=$($GREP '^# Linux' $CONFIG | \
> - sed -r 's/.* ([0-9])\.[0-9]{1,2}\.[0-9]{1,3}.*/\1/')
> -if [[ $KVER_MAJOR == 2 ]]; then
> -KVER_MINOR=$($GREP '^# Linux' $CONFIG | \
> - sed -r 's/.* 2.6.([0-9]{2}).*/\1/')
> -else
> -KVER_MINOR=$($GREP '^# Linux' $CONFIG | \
> - sed -r 's/.* [0-9]\.([0-9]{1,3})\.[0-9]{1,3}.*/\1/')
> -fi
> echo -n "File capabilities: " &&
> ( [[ ${KVER_MAJOR} == 2 && ${KVER_MINOR} < 33 ]] &&
> is_enabled CONFIG_SECURITY_FILE_CAPABILITIES ) ||
>
--
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Monitor your physical, virtual and cloud infrastructure from a single web console. Get in-depth insight into apps, servers, databases, vmware, SAP, cloud infrastructure, etc. Download 30-day Free Trial. Pricing starts from $795 for 25 servers or applications! http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel
