github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trying to fix build error

Browse Source
This commit is contained in:
Avinash Sridharan
2015-08-01 14:59:11 -07:00
parent 29f3ab7ccb
commit 6960d82c6b
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
docs/getting-started-guides/docker.md
View File

@@ -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: following configs are turned on in your linux kernel:
```console ```console
CONFIG_RESOURCE_COUNTERS=y
CONFIG_RESOURCE_COUNTERS=y CONFIG_MEMCG=y
CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG_SWAP=y CONFIG_MEMCG_SWAP_ENABLED=y
CONFIG_MEMCG_SWAP_ENABLED=y CONFIG_MEMCG_KMEM=y
CONFIG_MEMCG_KMEM=y
``` ```
3. Enable the memory and swap accounting in the kernel, at boot, as command line 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" 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 You can check the command line parameters passed to your kenel by looking at the
output of /proc/cmdline: output of /proc/cmdline:
```console ```console
$cat /proc/cmdline $cat /proc/cmdline
BOOT_IMAGE=/boot/vmlinuz-3.18.4-aufs root=/dev/sda5 ro cgroup_enable=memory BOOT_IMAGE=/boot/vmlinuz-3.18.4-aufs root=/dev/sda5 ro cgroup_enable=memory
swapaccount=1 swapaccount=1
``` ```