Sfoglia il codice sorgente

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>
Daniel Lezcano 14 anni fa
parent
commit
8dd2a82c29
1 ha cambiato i file con 8 aggiunte e 6 eliminazioni
  1. 8 6
      init/Kconfig

+ 8 - 6
init/Kconfig

@@ -734,7 +734,7 @@ config RELAY
 
 
 	  If unsure, say N.
 	  If unsure, say N.
 
 
-config NAMESPACES
+menuconfig NAMESPACES
 	bool "Namespaces support" if EMBEDDED
 	bool "Namespaces support" if EMBEDDED
 	default !EMBEDDED
 	default !EMBEDDED
 	help
 	help
@@ -743,9 +743,10 @@ config NAMESPACES
 	  or same user id or pid may refer to different tasks when used in
 	  or same user id or pid may refer to different tasks when used in
 	  different namespaces.
 	  different namespaces.
 
 
+if NAMESPACES
+
 config UTS_NS
 config UTS_NS
 	bool "UTS namespace"
 	bool "UTS namespace"
-	depends on NAMESPACES
 	default y
 	default y
 	help
 	help
 	  In this namespace tasks see different info provided with the
 	  In this namespace tasks see different info provided with the
@@ -753,7 +754,7 @@ config UTS_NS
 
 
 config IPC_NS
 config IPC_NS
 	bool "IPC namespace"
 	bool "IPC namespace"
-	depends on NAMESPACES && (SYSVIPC || POSIX_MQUEUE)
+	depends on (SYSVIPC || POSIX_MQUEUE)
 	default y
 	default y
 	help
 	help
 	  In this namespace tasks work with IPC ids which correspond to
 	  In this namespace tasks work with IPC ids which correspond to
@@ -761,7 +762,7 @@ config IPC_NS
 
 
 config USER_NS
 config USER_NS
 	bool "User namespace (EXPERIMENTAL)"
 	bool "User namespace (EXPERIMENTAL)"
-	depends on NAMESPACES && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	default y
 	default y
 	help
 	help
 	  This allows containers, i.e. vservers, to use user namespaces
 	  This allows containers, i.e. vservers, to use user namespaces
@@ -770,7 +771,6 @@ config USER_NS
 
 
 config PID_NS
 config PID_NS
 	bool "PID Namespaces"
 	bool "PID Namespaces"
-	depends on NAMESPACES
 	default y
 	default y
 	help
 	help
 	  Support process id namespaces.  This allows having multiple
 	  Support process id namespaces.  This allows having multiple
@@ -779,12 +779,14 @@ config PID_NS
 
 
 config NET_NS
 config NET_NS
 	bool "Network namespace"
 	bool "Network namespace"
-	depends on NAMESPACES && NET
+	depends on NET
 	default y
 	default y
 	help
 	help
 	  Allow user space to create what appear to be multiple instances
 	  Allow user space to create what appear to be multiple instances
 	  of the network stack.
 	  of the network stack.
 
 
+endif # NAMESPACES
+
 config BLK_DEV_INITRD
 config BLK_DEV_INITRD
 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
 	depends on BROKEN || !FRV
 	depends on BROKEN || !FRV