[backfire] merge r25815

[openwrt-10.03/.git] / package / busybox / config / util-linux / Config.in

diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index 526ea00cc07e8ae2b08bf60e6112875f9c90e73a..1d9db8efb7bd427c028188822bcf1843536f9143 100644 (file)
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -29,7 +29,7 @@ config BUSYBOX_CONFIG_FEATURE_ACPID_COMPAT
 
 config BUSYBOX_CONFIG_BLKID
        bool "blkid"
-       default n
+       default y
        select BUSYBOX_CONFIG_VOLUMEID
        help
          Lists labels and UUIDs of all filesystems.
@@ -250,6 +250,13 @@ config BUSYBOX_CONFIG_GETOPT
          written by others, this utility may be for you. Most people will
          wisely leave this disabled.
 
+config BUSYBOX_CONFIG_FEATURE_GETOPT_LONG
+       bool "Support option -l"
+       default n if BUSYBOX_CONFIG_LONG_OPTS
+       depends on BUSYBOX_CONFIG_GETOPT
+       help
+         Enable support for long options (option -l).
+
 config BUSYBOX_CONFIG_HEXDUMP
        bool "hexdump"
        default y
@@ -286,7 +293,7 @@ config BUSYBOX_CONFIG_HWCLOCK
 config BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS
        bool "Support long options (--hctosys,...)"
        default n
-       depends on BUSYBOX_CONFIG_HWCLOCK && BUSYBOX_CONFIG_GETOPT_LONG
+       depends on BUSYBOX_CONFIG_HWCLOCK && BUSYBOX_CONFIG_LONG_OPTS
        help
          By default, the hwclock utility only uses short options. If you
          are overly fond of its long options, such as --hctosys, --utc, etc)
@@ -388,7 +395,7 @@ config BUSYBOX_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE
 
 config BUSYBOX_CONFIG_MKSWAP
        bool "mkswap"
-       default n
+       default y
        help
          The mkswap utility is used to configure a file or disk partition as
          Linux swap space. This allows Linux to use the entire file or
@@ -399,15 +406,12 @@ config BUSYBOX_CONFIG_MKSWAP
          Once you have created swap space using 'mkswap' you need to enable
          the swap space using the 'swapon' utility.
 
-config BUSYBOX_CONFIG_FEATURE_MKSWAP_V0
-       bool "Version 0 support"
-       default n
+config BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID
+       bool "UUID support"
+       default y
        depends on BUSYBOX_CONFIG_MKSWAP
-#      depends on MKSWAP && BUSYBOX_CONFIG_DEPRECATED
        help
-         Enable support for the old v0 style.
-         If your kernel is older than 2.1.117, then v0 support is the
-         only option.
+         Generate swap spaces with universally unique identifiers.
 
 config BUSYBOX_CONFIG_MORE
        bool "more"
@@ -436,28 +440,28 @@ config BUSYBOX_CONFIG_VOLUMEID
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT
        bool "Ext filesystem"
-       default n
+       default y
        depends on BUSYBOX_CONFIG_VOLUMEID
        help
          TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS
        bool "Reiser filesystem"
-       default n
+       default y
        depends on BUSYBOX_CONFIG_VOLUMEID
        help
          TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT
        bool "fat filesystem"
-       default n
+       default y
        depends on BUSYBOX_CONFIG_VOLUMEID
        help
          TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS
        bool "hfs filesystem"
-       default n
+       default y
        depends on BUSYBOX_CONFIG_VOLUMEID
        help
          TODO
@@ -478,28 +482,28 @@ config BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS
        bool "xfs filesystem"
-       default n
+       default y
        depends on BUSYBOX_CONFIG_VOLUMEID
        help
          TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS
        bool "ntfs filesystem"
-       default n
+       default y
        depends on BUSYBOX_CONFIG_VOLUMEID
        help
          TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660
        bool "iso9660 filesystem"
-       default n
+       default y
        depends on BUSYBOX_CONFIG_VOLUMEID
        help
          TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF
        bool "udf filesystem"
-       default n
+       default y
        depends on BUSYBOX_CONFIG_VOLUMEID
        help
          TODO
@@ -513,7 +517,7 @@ config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LUKS
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP
        bool "linux swap filesystem"
-       default n
+       default y
        depends on BUSYBOX_CONFIG_VOLUMEID
        help
          TODO
@@ -633,7 +637,7 @@ config BUSYBOX_CONFIG_FEATURE_VOLUMEID_OCFS2
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXRAID
        bool "linuxraid"
-       default n
+       default y
        depends on BUSYBOX_CONFIG_VOLUMEID
        help
          TODO
@@ -667,7 +671,7 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS
        bool "Support mount helpers"
-       default n
+       default y
        depends on BUSYBOX_CONFIG_MOUNT
        help
          Enable mounting of virtual file systems via external helpers.
@@ -764,6 +768,13 @@ config BUSYBOX_CONFIG_SCRIPT
        help
          The script makes typescript of terminal session.
 
+config BUSYBOX_CONFIG_SCRIPTREPLAY
+       bool "scriptreplay"
+       default n
+       help
+         This program replays a typescript, using timing information
+         given by script -t.
+
 config BUSYBOX_CONFIG_SETARCH
        bool "setarch"
        default n
@@ -775,7 +786,7 @@ config BUSYBOX_CONFIG_SETARCH
 
 config BUSYBOX_CONFIG_SWAPONOFF
        bool "swaponoff"
-       default n
+       default y
        help
          This option enables both the 'swapon' and the 'swapoff' utilities.
          Once you have created some swap space using 'mkswap', you also need