From 6960d82c6b18e9de04ddbb191530851c25bd7abd Mon Sep 17 00:00:00 2001 From: Avinash Sridharan Date: Sat, 1 Aug 2015 14:59:11 -0700 Subject: [PATCH] trying to fix build error --- docs/getting-started-guides/docker.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/getting-started-guides/docker.md b/docs/getting-started-guides/docker.md index 17e0d0402bf..05c638f17ca 100644 --- a/docs/getting-started-guides/docker.md +++ b/docs/getting-started-guides/docker.md @@ -59,12 +59,11 @@ Here's a diagram of what the final result will look like: following configs are turned on in your linux kernel: ```console - - CONFIG_RESOURCE_COUNTERS=y - CONFIG_MEMCG=y - CONFIG_MEMCG_SWAP=y - CONFIG_MEMCG_SWAP_ENABLED=y - CONFIG_MEMCG_KMEM=y + CONFIG_RESOURCE_COUNTERS=y + CONFIG_MEMCG=y + CONFIG_MEMCG_SWAP=y + CONFIG_MEMCG_SWAP_ENABLED=y + CONFIG_MEMCG_KMEM=y ``` 3. Enable the memory and swap accounting in the kernel, at boot, as command line @@ -74,12 +73,12 @@ parameters as follows: GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1" ``` - NOTE: The above is specifically for GRUB2. + NOTE: The above is specifically for GRUB2. You can check the command line parameters passed to your kenel by looking at the output of /proc/cmdline: ```console - $cat /proc/cmdline + $cat /proc/cmdline BOOT_IMAGE=/boot/vmlinuz-3.18.4-aufs root=/dev/sda5 ro cgroup_enable=memory swapaccount=1 ```