[PATCH v2 09/10] kconfigs: clean up Kconfig.bringup.goals

[Scott Mayhew <smayhew@redhat.com>]

Move 'config KDEVOPS_SETUP_NFSD' and 'menu "Configure the kernel NFS
server"' out of Kconfig.bringup.goals and into Kconfig.nfsd.  This is
simply to keep the top level kconfigs cleaner.

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
 kconfigs/Kconfig.bringup.goals | 12 ------------
 kconfigs/Kconfig.nfsd          | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/kconfigs/Kconfig.bringup.goals b/kconfigs/Kconfig.bringup.goals
index 71948e9b..fc6af7f8 100644
--- a/kconfigs/Kconfig.bringup.goals
+++ b/kconfigs/Kconfig.bringup.goals
@@ -96,16 +96,4 @@ config KDEVOPS_SETUP_KTLS
 	  authority, and configure tlshd on the hosts to use it. This is
 	  necessary for testing RPC over TLS, or NVMe over TCP.
 
-config KDEVOPS_SETUP_NFSD
-	bool "Set up the kernel nfs server"
-	default n
-	help
-	  Configure and bring up the kernel NFS server. This will provision
-	  a filesystem on a block device, mount it, export it and start up the
-	  nfs server and associated daemons.
-
-if KDEVOPS_SETUP_NFSD
-menu "Configure the kernel NFS server"
 source "kconfigs/Kconfig.nfsd"
-endmenu
-endif
diff --git a/kconfigs/Kconfig.nfsd b/kconfigs/Kconfig.nfsd
index db80d8c0..dec98c1e 100644
--- a/kconfigs/Kconfig.nfsd
+++ b/kconfigs/Kconfig.nfsd
@@ -1,4 +1,16 @@
 # FIXME: need defaults for terraform hosts
+config KDEVOPS_SETUP_NFSD
+	bool "Set up the kernel nfs server"
+	default n
+	help
+	  Configure and bring up the kernel NFS server. This will provision
+	  a filesystem on a block device, mount it, export it and start up the
+	  nfs server and associated daemons.
+
+if KDEVOPS_SETUP_NFSD
+
+menu "Configure the kernel NFS server"
+
 config NFSD_EXPORT_DEVICE_PREFIX
 	string "The device prefix to use for LVM PVs"
 	default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
@@ -70,3 +82,7 @@ config NFSD_LEASE_TIME
 	  allow a large client cohort enough time to recover their open
 	  and lock state. But a shorter lease time helps certain tests
 	  complete faster.
+
+endmenu
+
+endif
-- 
2.43.0