aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@free.fr>2010-10-27 15:34:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 18:03:16 -0700
commit8dd2a82c29111bb8ad2a2933aa269b49f72d356d (patch)
tree1b4f303aee710af71aae97de9690a925757f7013 /init
parent17a6d4411a4dc7e436e1a71c24e10048452edd98 (diff)
downloadlinux-2.6.38-lt-ux500-8dd2a82c29111bb8ad2a2933aa269b49f72d356d.tar.gz
namespaces Kconfig: make namespace a submenu
Make the namespaces config option a submenu. Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr> Cc: Li Zefan <lizf@cn.fujitsu.com> Cc: "Serge E. Hallyn" <serue@us.ibm.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Paul Menage <menage@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig14
1 files changed, 8 insertions, 6 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 239fae49750..5b3a3942a98 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -734,7 +734,7 @@ config RELAY
If unsure, say N.
-config NAMESPACES
+menuconfig NAMESPACES
bool "Namespaces support" if EMBEDDED
default !EMBEDDED
help
@@ -743,9 +743,10 @@ config NAMESPACES
or same user id or pid may refer to different tasks when used in
different namespaces.
+if NAMESPACES
+
config UTS_NS
bool "UTS namespace"
- depends on NAMESPACES
default y
help
In this namespace tasks see different info provided with the
@@ -753,7 +754,7 @@ config UTS_NS
config IPC_NS
bool "IPC namespace"
- depends on NAMESPACES && (SYSVIPC || POSIX_MQUEUE)
+ depends on (SYSVIPC || POSIX_MQUEUE)
default y
help
In this namespace tasks work with IPC ids which correspond to
@@ -761,7 +762,7 @@ config IPC_NS
config USER_NS
bool "User namespace (EXPERIMENTAL)"
- depends on NAMESPACES && EXPERIMENTAL
+ depends on EXPERIMENTAL
default y
help
This allows containers, i.e. vservers, to use user namespaces
@@ -770,7 +771,6 @@ config USER_NS
config PID_NS
bool "PID Namespaces"
- depends on NAMESPACES
default y
help
Support process id namespaces. This allows having multiple
@@ -779,12 +779,14 @@ config PID_NS
config NET_NS
bool "Network namespace"
- depends on NAMESPACES && NET
+ depends on NET
default y
help
Allow user space to create what appear to be multiple instances
of the network stack.
+endif # NAMESPACES
+
config BLK_DEV_INITRD
bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
depends on BROKEN || !FRV