[package] dnsmasq: remove redundant code introduced with r20074

[openwrt.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 6e3fc39..9d5462b 100644 (file)
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -5,6 +5,37 @@
 
 menu "Linux System Utilities"
 
+config BUSYBOX_CONFIG_ACPID
+       bool "acpid"
+       default n
+       help
+         acpid listens to ACPI events coming either in textual form from
+         /proc/acpi/event (though it is marked deprecated it is still widely
+         used and _is_ a standard) or in binary form from specified evdevs
+         (just use /dev/input/event*).
+
+         It parses the event to retrieve ACTION and a possible PARAMETER.
+         It then spawns /etc/acpi/<ACTION>[/<PARAMETER>] either via run-parts
+         (if the resulting path is a directory) or directly as an executable.
+
+         N.B. acpid relies on run-parts so have the latter installed.
+
+config BUSYBOX_CONFIG_FEATURE_ACPID_COMPAT
+       bool "Accept and ignore redundant options"
+       default n
+       depends on BUSYBOX_CONFIG_ACPID
+       help
+         Accept and ignore compatibility options -g -m -s -S -v.
+
+config BUSYBOX_CONFIG_BLKID
+       bool "blkid"
+       default n
+       select BUSYBOX_CONFIG_VOLUMEID
+       help
+         Lists labels and UUIDs of all filesystems.
+         WARNING:
+         With all submodules selected, it will add ~8k to busybox.
+
 config BUSYBOX_CONFIG_DMESG
        bool "dmesg"
        default y
@@ -156,9 +187,7 @@ config BUSYBOX_CONFIG_FINDFS
        default n
        select BUSYBOX_CONFIG_VOLUMEID
        help
-         This is similar to the findfs program that is part of the e2fsprogs
-         package. However, the e2fsprogs version only support ext2/3. This
-         version supports those in addition to FAT, swap, and ReiserFS.
+         Prints the name of a filesystem with given label or UUID.
          WARNING:
          With all submodules selected, it will add ~8k to busybox.
 
@@ -204,6 +233,12 @@ config BUSYBOX_CONFIG_FEATURE_MINIX2
          this. If you enabled 'mkfs_minix' then you almost certainly want to
          be using the version 2 filesystem support.
 
+config BUSYBOX_CONFIG_MKFS_VFAT
+       bool "mkfs_vfat"
+       default n
+       help
+         Utility to create FAT32 filesystems.
+
 config BUSYBOX_CONFIG_GETOPT
        bool "getopt"
        default n
@@ -215,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
@@ -251,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)
@@ -364,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"
+config BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID
+       bool "UUID support"
        default n
        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"
@@ -396,10 +435,8 @@ config BUSYBOX_CONFIG_FEATURE_USE_TERMIOS
          unable to move the cursor.
 
 config BUSYBOX_CONFIG_VOLUMEID
-       bool "Routines for detecting label and uuid on common filesystems"
+       bool #No description makes it a hidden option
        default n
-       help
-         TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT
        bool "Ext filesystem"
@@ -651,7 +688,7 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL
        select BUSYBOX_CONFIG_VOLUMEID
        help
          This allows for specifying a device by label or uuid, rather than by
-         name. This feature utilizes the same functionality as findfs.
+         name. This feature utilizes the same functionality as blkid/findfs.
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
        bool "Support mounting NFS file systems"
@@ -731,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