diff options
| -rw-r--r-- | init/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index c91ce6bcbe68..239fae49750b 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -746,6 +746,7 @@ config NAMESPACES | |||
| 746 | config UTS_NS | 746 | config UTS_NS |
| 747 | bool "UTS namespace" | 747 | bool "UTS namespace" |
| 748 | depends on NAMESPACES | 748 | depends on NAMESPACES |
| 749 | default y | ||
| 749 | help | 750 | help |
| 750 | In this namespace tasks see different info provided with the | 751 | In this namespace tasks see different info provided with the |
| 751 | uname() system call | 752 | uname() system call |
| @@ -753,6 +754,7 @@ config UTS_NS | |||
| 753 | config IPC_NS | 754 | config IPC_NS |
| 754 | bool "IPC namespace" | 755 | bool "IPC namespace" |
| 755 | depends on NAMESPACES && (SYSVIPC || POSIX_MQUEUE) | 756 | depends on NAMESPACES && (SYSVIPC || POSIX_MQUEUE) |
| 757 | default y | ||
| 756 | help | 758 | help |
| 757 | In this namespace tasks work with IPC ids which correspond to | 759 | In this namespace tasks work with IPC ids which correspond to |
| 758 | different IPC objects in different namespaces. | 760 | different IPC objects in different namespaces. |
| @@ -760,6 +762,7 @@ config IPC_NS | |||
| 760 | config USER_NS | 762 | config USER_NS |
| 761 | bool "User namespace (EXPERIMENTAL)" | 763 | bool "User namespace (EXPERIMENTAL)" |
| 762 | depends on NAMESPACES && EXPERIMENTAL | 764 | depends on NAMESPACES && EXPERIMENTAL |
| 765 | default y | ||
| 763 | help | 766 | help |
| 764 | This allows containers, i.e. vservers, to use user namespaces | 767 | This allows containers, i.e. vservers, to use user namespaces |
| 765 | to provide different user info for different servers. | 768 | to provide different user info for different servers. |
| @@ -767,8 +770,8 @@ config USER_NS | |||
| 767 | 770 | ||
| 768 | config PID_NS | 771 | config PID_NS |
| 769 | bool "PID Namespaces" | 772 | bool "PID Namespaces" |
| 770 | default n | ||
| 771 | depends on NAMESPACES | 773 | depends on NAMESPACES |
| 774 | default y | ||
| 772 | help | 775 | help |
| 773 | Support process id namespaces. This allows having multiple | 776 | Support process id namespaces. This allows having multiple |
| 774 | processes with the same pid as long as they are in different | 777 | processes with the same pid as long as they are in different |
| @@ -776,8 +779,8 @@ config PID_NS | |||
| 776 | 779 | ||
| 777 | config NET_NS | 780 | config NET_NS |
| 778 | bool "Network namespace" | 781 | bool "Network namespace" |
| 779 | default n | ||
| 780 | depends on NAMESPACES && NET | 782 | depends on NAMESPACES && NET |
| 783 | default y | ||
| 781 | help | 784 | help |
| 782 | Allow user space to create what appear to be multiple instances | 785 | Allow user space to create what appear to be multiple instances |
| 783 | of the network stack. | 786 | of the network stack. |
