UBUNTU: Enable CONFIG_NFSD_V4=y in -virtual flavour. Bug: #224138
 

It looks like this was just an oversight since all other flavours have this
option enabled. Even though this is the virtual kernel flavour, having full
NFS functionality kind of makes sense.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
debian/config/i386/config | 1 +
debian/config/i386/config.386 | 1 -
debian/config/i386/config.generic | 1 -
debian/config/i386/config.server | 1 -
debian/config/i386/config.virtual | 1 -
debian/config/ia64/config | 3 +--
debian/config/powerpc/config | 1 -
7 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/config/i386/config b/debian/config/i386/config
index a84382b..17e8f1f 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -814,6 +814,7 @@ CONFIG_NFS_DIRECTIO=y
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_AMANDA=m
CONFIG_NF_CONNTRACK_ENABLED=m
diff --git a/debian/config/i386/config.386 b/debian/config/i386/config.386
index 7fcad09..b6161a4 100644
--- a/debian/config/i386/config.386
+++ b/debian/config/i386/config.386
@@ -1107,7 +1107,6 @@ CONFIG_NET_VENDOR_3COM=y
CONFIG_NET_VENDOR_RACAL=y
CONFIG_NET_VENDOR_SMC=y
CONFIG_NEW_LEDS=y
-CONFIG_NFS_V4=y
CONFIG_NFTL=m
CONFIG_NFTL_RW=y
CONFIG_NF_CONNTRACK_H323=m
diff --git a/debian/config/i386/config.generic b/debian/config/i386/config.generic
index 6600fa1..ccae931 100644
--- a/debian/config/i386/config.generic
+++ b/debian/config/i386/config.generic
@@ -1104,7 +1104,6 @@ CONFIG_NET_VENDOR_3COM=y
CONFIG_NET_VENDOR_RACAL=y
CONFIG_NET_VENDOR_SMC=y
CONFIG_NEW_LEDS=y
-CONFIG_NFS_V4=y
CONFIG_NFTL=m
CONFIG_NFTL_RW=y
CONFIG_NF_CONNTRACK_H323=m
diff --git a/debian/config/i386/config.server b/debian/config/i386/config.server
index 1b6f983..24f3132 100644
--- a/debian/config/i386/config.server
+++ b/debian/config/i386/config.server
@@ -1105,7 +1105,6 @@ CONFIG_NET_VENDOR_3COM=y
CONFIG_NET_VENDOR_RACAL=y
CONFIG_NET_VENDOR_SMC=y
CONFIG_NEW_LEDS=y
-CONFIG_NFS_V4=y
CONFIG_NFTL=m
CONFIG_NFTL_RW=y
CONFIG_NF_CONNTRACK_H323=m
diff --git a/debian/config/i386/config.virtual b/debian/config/i386/config.virtual
index 873e143..17ac914 100644
--- a/debian/config/i386/config.virtual
+++ b/debian/config/i386/config.virtual
@@ -289,7 +289,6 @@ CONFIG_NET_CLS_POLICE=y
# CONFIG_NET_TCPPROBE is not set
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NEW_LEDS is not set
-# CONFIG_NFS_V4 is not set
# CONFIG_NF_CONNTRACK_H323 is not set
# CONFIG_NF_CONNTRACK_IPV6 is not set
# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index f6f7aae..c7acc58 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -411,7 +411,6 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_LIST is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_MUTEXES is not set
-CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_SG is not set
# CONFIG_DEBUG_SHIRQ is not set
@@ -476,7 +475,7 @@ CONFIG_DRM_SAVAGE=m
CONFIG_DRM_SIS=m
CONFIG_DRM_TDFX=m
CONFIG_DRM_VIA=m
-CONFIG_DRM_VIA_CHROME9=n
+# CONFIG_DRM_VIA_CHROME9 is not set
CONFIG_DS1682=m
CONFIG_DSCC4=m
# CONFIG_DSCC4_PCISYNC is not set
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index f1a877e..48a6fd0 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -420,7 +420,6 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_LIST is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_MUTEXES is not set
-CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_SG is not set
# CONFIG_DEBUG_SHIRQ is not set
--
1.5.6.3


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team