Fix some compiler warnings emitted by gcc-4.8.0

[oweals/busybox.git] / util-linux / Config.src

diff --git a/util-linux/Config.src b/util-linux/Config.src
index 888bc8f3b5bb19b311ceb16a4a20cf3bd232d65a..5a8b0063bb460463985db74b66560896191718d1 100644 (file)
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -485,13 +485,18 @@ config FEATURE_MOUNT_LABEL
          This also enables label or uuid support for swapon.
 
 config FEATURE_MOUNT_NFS
-       bool "Support mounting NFS file systems"
-       default y
+       bool "Support mounting NFS file systems on Linux < 2.6.23"
+       default n
        depends on MOUNT
        select FEATURE_HAVE_RPC
        select FEATURE_SYSLOG
        help
-         Enable mounting of NFS file systems.
+         Enable mounting of NFS file systems on Linux kernels prior
+         to version 2.6.23. Note that in this case mounting of NFS
+         over IPv6 will not be possible.
+
+         Note that this option links in RPC support from libc,
+         which is rather large (~10 kbytes on uclibc).
 
 config FEATURE_MOUNT_CIFS
        bool "Support mounting CIFS/SMB file systems"
@@ -694,224 +699,6 @@ config FEATURE_MTAB_SUPPORT
          About the only reason to use this is if you've removed /proc from
          your kernel.
 
-config VOLUMEID
-       bool #No description makes it a hidden option
-       default n
-
-menu "Filesystem/Volume identification"
-       depends on VOLUMEID
-
-config FEATURE_VOLUMEID_EXT
-       bool "Ext filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-config FEATURE_VOLUMEID_BTRFS
-       bool "btrfs filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-config FEATURE_VOLUMEID_REISERFS
-       bool "Reiser filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-config FEATURE_VOLUMEID_FAT
-       bool "fat filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-config FEATURE_VOLUMEID_HFS
-       bool "hfs filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-config FEATURE_VOLUMEID_JFS
-       bool "jfs filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-### config FEATURE_VOLUMEID_UFS
-###    bool "ufs filesystem"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-config FEATURE_VOLUMEID_XFS
-       bool "xfs filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-config FEATURE_VOLUMEID_NTFS
-       bool "ntfs filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-config FEATURE_VOLUMEID_ISO9660
-       bool "iso9660 filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-config FEATURE_VOLUMEID_UDF
-       bool "udf filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-config FEATURE_VOLUMEID_LUKS
-       bool "luks filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-config FEATURE_VOLUMEID_LINUXSWAP
-       bool "linux swap filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-### config FEATURE_VOLUMEID_LVM
-###    bool "lvm"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-config FEATURE_VOLUMEID_CRAMFS
-       bool "cramfs filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-### config FEATURE_VOLUMEID_HPFS
-###    bool "hpfs filesystem"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-config FEATURE_VOLUMEID_ROMFS
-       bool "romfs filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-config FEATURE_VOLUMEID_SYSV
-       bool "sysv filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-### config FEATURE_VOLUMEID_MINIX
-###    bool "minix filesystem"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-### These only detect partition tables - not used (yet?)
-### config FEATURE_VOLUMEID_MAC
-###    bool "mac filesystem"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-###
-### config FEATURE_VOLUMEID_MSDOS
-###    bool "msdos filesystem"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-config FEATURE_VOLUMEID_OCFS2
-       bool "ocfs2 filesystem"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-### config FEATURE_VOLUMEID_HIGHPOINTRAID
-###    bool "highpoint raid"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-### config FEATURE_VOLUMEID_ISWRAID
-###    bool "intel raid"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-### config FEATURE_VOLUMEID_LSIRAID
-###    bool "lsi raid"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-### config FEATURE_VOLUMEID_VIARAID
-###    bool "via raid"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-### config FEATURE_VOLUMEID_SILICONRAID
-###    bool "silicon raid"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-### config FEATURE_VOLUMEID_NVIDIARAID
-###    bool "nvidia raid"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-### config FEATURE_VOLUMEID_PROMISERAID
-###    bool "promise raid"
-###    default y
-###    depends on VOLUMEID
-###    help
-###      TODO
-
-config FEATURE_VOLUMEID_LINUXRAID
-       bool "linuxraid"
-       default y
-       depends on VOLUMEID
-       help
-         TODO
-
-endmenu
+source util-linux/volume_id/Config.in
 
 endmenu