[package] libpcap: explicitely disable libnl support to prevent different build resul...

[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 a7e4467..14d4777 100644 (file)
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -1,3 +1,4 @@
+# DO NOT EDIT. This file is generated from Config.src

 #
 # For a description of the syntax of this configuration file,
 # see scripts/kbuild/config-language.txt.
 #
 # For a description of the syntax of this configuration file,
 # see scripts/kbuild/config-language.txt.


@@ -5,25 +6,78 @@
 
 menu "Linux System Utilities"
 
 
 menu "Linux System Utilities"
 

+config BUSYBOX_CONFIG_BLOCKDEV
+       bool "blockdev"
+       default n
+       help
+         Performs some ioctls with block devices.
+config BUSYBOX_CONFIG_REV
+       bool "rev"
+       default n
+       help
+         Reverse lines of a file or files.
+
+config BUSYBOX_CONFIG_ACPID
+       bool "acpid"
+       default n
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       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_PLATFORM_LINUX
+       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_FEATURE_BLKID_TYPE
+       bool "Print filesystem type"
+       default n
+       depends on BUSYBOX_CONFIG_BLKID
+       help
+         Show TYPE="filesystem type"
+

 config BUSYBOX_CONFIG_DMESG
        bool "dmesg"
        default y
 config BUSYBOX_CONFIG_DMESG
        bool "dmesg"
        default y

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
        help

-         dmesg is used to examine or control the kernel ring buffer.  When the
+         dmesg is used to examine or control the kernel ring buffer. When the

          Linux kernel prints messages to the system log, they are stored in
          Linux kernel prints messages to the system log, they are stored in

-         the kernel ring buffer.  You can use dmesg to print the kernel's ring
+         the kernel ring buffer. You can use dmesg to print the kernel's ring

          buffer, clear the kernel ring buffer, change the size of the kernel
          ring buffer, and change the priority level at which kernel messages
          buffer, clear the kernel ring buffer, change the size of the kernel
          ring buffer, and change the priority level at which kernel messages

-         are also logged to the system console.  Enable this option if you
+         are also logged to the system console. Enable this option if you

          wish to enable the 'dmesg' utility.
 
 config BUSYBOX_CONFIG_FEATURE_DMESG_PRETTY
          wish to enable the 'dmesg' utility.
 
 config BUSYBOX_CONFIG_FEATURE_DMESG_PRETTY

-       bool "pretty dmesg output"
+       bool "Pretty dmesg output"

        default y
        depends on BUSYBOX_CONFIG_DMESG
        help
          If you wish to scrub the syslog level from the output, say 'Y' here.
        default y
        depends on BUSYBOX_CONFIG_DMESG
        help
          If you wish to scrub the syslog level from the output, say 'Y' here.

-         The syslog level is a string prefixed to every line with the form "<#>".
+         The syslog level is a string prefixed to every line with the form
+         "<#>".

 
          With this option you will see:
            # dmesg
 
          With this option you will see:
            # dmesg


@@ -40,10 +94,11 @@ config BUSYBOX_CONFIG_FEATURE_DMESG_PRETTY
 config BUSYBOX_CONFIG_FBSET
        bool "fbset"
        default n
 config BUSYBOX_CONFIG_FBSET
        bool "fbset"
        default n

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          fbset is used to show or change the settings of a Linux frame buffer
        help
          fbset is used to show or change the settings of a Linux frame buffer

-         device.  The frame buffer device provides a simple and unique
-         interface to access a graphics display.  Enable this option
+         device. The frame buffer device provides a simple and unique
+         interface to access a graphics display. Enable this option

          if you wish to enable the 'fbset' utility.
 
 config BUSYBOX_CONFIG_FEATURE_FBSET_FANCY
          if you wish to enable the 'fbset' utility.
 
 config BUSYBOX_CONFIG_FEATURE_FBSET_FANCY


@@ -52,8 +107,8 @@ config BUSYBOX_CONFIG_FEATURE_FBSET_FANCY
        depends on BUSYBOX_CONFIG_FBSET
        help
          This option enables extended fbset options, allowing one to set the
        depends on BUSYBOX_CONFIG_FBSET
        help
          This option enables extended fbset options, allowing one to set the

-         framebuffer size, color depth, etc.  interface to access a graphics
-         display.  Enable this option if you wish to enable extended fbset
+         framebuffer size, color depth, etc. interface to access a graphics
+         display. Enable this option if you wish to enable extended fbset

          options.
 
 config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE
          options.
 
 config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE


@@ -68,34 +123,38 @@ config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE
 config BUSYBOX_CONFIG_FDFLUSH
        bool "fdflush"
        default n
 config BUSYBOX_CONFIG_FDFLUSH
        bool "fdflush"
        default n

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          fdflush is only needed when changing media on slightly-broken
        help
          fdflush is only needed when changing media on slightly-broken

-         removable media drives.  It is used to make Linux believe that a
+         removable media drives. It is used to make Linux believe that a

          hardware disk-change switch has been actuated, which causes Linux to
          hardware disk-change switch has been actuated, which causes Linux to

-         forget anything it has cached from the previous media.  If you have
+         forget anything it has cached from the previous media. If you have

          such a slightly-broken drive, you will need to run fdflush every time
          such a slightly-broken drive, you will need to run fdflush every time

-         you change a disk.  Most people have working hardware and can safely
+         you change a disk. Most people have working hardware and can safely

          leave this disabled.
 
 config BUSYBOX_CONFIG_FDFORMAT
        bool "fdformat"
        default n
          leave this disabled.
 
 config BUSYBOX_CONFIG_FDFORMAT
        bool "fdformat"
        default n

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          fdformat is used to low-level format a floppy disk.
 
 config BUSYBOX_CONFIG_FDISK
        bool "fdisk"
        default n
        help
          fdformat is used to low-level format a floppy disk.
 
 config BUSYBOX_CONFIG_FDISK
        bool "fdisk"
        default n

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          The fdisk utility is used to divide hard disks into one or more
        help
          The fdisk utility is used to divide hard disks into one or more

-         logical disks, which are generally called partitions.  This utility
+         logical disks, which are generally called partitions. This utility

          can be used to list and edit the set of partitions or BSD style
          'disk slices' that are defined on a hard drive.
 
 config BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS
          can be used to list and edit the set of partitions or BSD style
          'disk slices' that are defined on a hard drive.
 
 config BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS

-       bool "support over 4GB disks"
+       bool "Support over 4GB disks"

        default y
        depends on BUSYBOX_CONFIG_FDISK
        default y
        depends on BUSYBOX_CONFIG_FDISK

+       depends on !BUSYBOX_CONFIG_LFS   # with LFS no special code is needed

        help
          Enable this option to support large disks > 4GB.
 
        help
          Enable this option to support large disks > 4GB.
 


@@ -105,7 +164,7 @@ config BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
        depends on BUSYBOX_CONFIG_FDISK
        help
          Enabling this option allows you to create or change a partition table
        depends on BUSYBOX_CONFIG_FDISK
        help
          Enabling this option allows you to create or change a partition table

-         and write those changes out to disk.  If you leave this option
+         and write those changes out to disk. If you leave this option

          disabled, you will only be able to view the partition table.
 
 config BUSYBOX_CONFIG_FEATURE_AIX_LABEL
          disabled, you will only be able to view the partition table.
 
 config BUSYBOX_CONFIG_FEATURE_AIX_LABEL


@@ -140,6 +199,14 @@ config BUSYBOX_CONFIG_FEATURE_OSF_LABEL
          Enabling this option allows you to create or change BSD disklabels
          and define and edit BSD disk slices.
 
          Enabling this option allows you to create or change BSD disklabels
          and define and edit BSD disk slices.
 

+config BUSYBOX_CONFIG_FEATURE_GPT_LABEL
+       bool "Support GPT disklabels"
+       default n
+       depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
+       help
+         Enabling this option allows you to view GUID Partition Table
+         disklabels.
+

 config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED
        bool "Support expert mode"
        default n
 config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED
        bool "Support expert mode"
        default n


@@ -147,18 +214,35 @@ config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED
        help
          Enabling this option allows you to do terribly unsafe things like
          define arbitrary drive geometry, move the beginning of data in a
        help
          Enabling this option allows you to do terribly unsafe things like
          define arbitrary drive geometry, move the beginning of data in a

-         partition, and similarly evil things.  Unless you have a very good
+         partition, and similarly evil things. Unless you have a very good

          reason you would be wise to leave this disabled.
 
          reason you would be wise to leave this disabled.
 

+config BUSYBOX_CONFIG_FINDFS
+       bool "findfs"
+       default n
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       select BUSYBOX_CONFIG_VOLUMEID
+       help
+         Prints the name of a filesystem with given label or UUID.
+         WARNING:
+         With all submodules selected, it will add ~8k to busybox.
+
+config BUSYBOX_CONFIG_FLOCK
+       bool "flock"
+       default n
+       help
+         Manage locks from shell scripts
+

 config BUSYBOX_CONFIG_FREERAMDISK
        bool "freeramdisk"
        default n
 config BUSYBOX_CONFIG_FREERAMDISK
        bool "freeramdisk"
        default n

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
        help

-         Linux allows you to create ramdisks.  This utility allows you to
+         Linux allows you to create ramdisks. This utility allows you to

          delete them and completely free all memory that was used for the
          delete them and completely free all memory that was used for the

-         ramdisk.  For example, if you boot Linux into a ramdisk and later
+         ramdisk. For example, if you boot Linux into a ramdisk and later

          pivot_root, you may want to free the memory that is allocated to the
          pivot_root, you may want to free the memory that is allocated to the

-         ramdisk.  If you have no use for freeing memory from a ramdisk, leave
+         ramdisk. If you have no use for freeing memory from a ramdisk, leave

          this disabled.
 
 config BUSYBOX_CONFIG_FSCK_MINIX
          this disabled.
 
 config BUSYBOX_CONFIG_FSCK_MINIX


@@ -166,31 +250,51 @@ config BUSYBOX_CONFIG_FSCK_MINIX
        default n
        help
          The minix filesystem is a nice, small, compact, read-write filesystem
        default n
        help
          The minix filesystem is a nice, small, compact, read-write filesystem

-         with little overhead.  It is not a journaling filesystem however and
+         with little overhead. It is not a journaling filesystem however and

          can experience corruption if it is not properly unmounted or if the
          can experience corruption if it is not properly unmounted or if the

-         power goes off in the middle of a write.  This utility allows you to
+         power goes off in the middle of a write. This utility allows you to

          check for and attempt to repair any corruption that occurs to a minix
          filesystem.
 
          check for and attempt to repair any corruption that occurs to a minix
          filesystem.
 

+config BUSYBOX_CONFIG_MKFS_EXT2
+       bool "mkfs_ext2"
+       default n
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       help
+         Utility to create EXT2 filesystems.
+

 config BUSYBOX_CONFIG_MKFS_MINIX
        bool "mkfs_minix"
        default n
 config BUSYBOX_CONFIG_MKFS_MINIX
        bool "mkfs_minix"
        default n

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          The minix filesystem is a nice, small, compact, read-write filesystem
        help
          The minix filesystem is a nice, small, compact, read-write filesystem

-         with little overhead.  If you wish to be able to create minix filesystems
-         this utility will do the job for you.
-
-comment "Minix filesystem support"
-       depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
+         with little overhead. If you wish to be able to create minix
+         filesystems this utility will do the job for you.

 
 config BUSYBOX_CONFIG_FEATURE_MINIX2
        bool "Support Minix fs v2 (fsck_minix/mkfs_minix)"
        default n
        depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
        help
 
 config BUSYBOX_CONFIG_FEATURE_MINIX2
        bool "Support Minix fs v2 (fsck_minix/mkfs_minix)"
        default n
        depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
        help

-         If you wish to be able to create version 2 minix filesystems, enable this.
-         If you enabled 'mkfs_minix' then you almost certainly want to be using the
-         version 2 filesystem support.
+         If you wish to be able to create version 2 minix filesystems, enable
+         this. If you enabled 'mkfs_minix' then you almost certainly want to
+         be using the version 2 filesystem support.
+
+config BUSYBOX_CONFIG_MKFS_REISER
+       bool "mkfs_reiser"
+       default n
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       help
+         Utility to create ReiserFS filesystems.
+         Note: this applet needs a lot of testing and polishing.
+
+config BUSYBOX_CONFIG_MKFS_VFAT
+       bool "mkfs_vfat"
+       default n
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       help
+         Utility to create FAT32 filesystems.

 
 config BUSYBOX_CONFIG_GETOPT
        bool "getopt"
 
 config BUSYBOX_CONFIG_GETOPT
        bool "getopt"


@@ -198,11 +302,18 @@ config BUSYBOX_CONFIG_GETOPT
        help
          The getopt utility is used to break up (parse) options in command
          lines to make it easy to write complex shell scripts that also check
        help
          The getopt utility is used to break up (parse) options in command
          lines to make it easy to write complex shell scripts that also check

-         for legal (and illegal) options.  If you want to write horribly
+         for legal (and illegal) options. If you want to write horribly

          complex shell scripts, or use some horribly complex shell script
          complex shell scripts, or use some horribly complex shell script

-         written by others, this utility may be for you.  Most people will
+         written by others, this utility may be for you. Most people will

          wisely leave this disabled.
 
          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
 config BUSYBOX_CONFIG_HEXDUMP
        bool "hexdump"
        default y


@@ -210,40 +321,57 @@ config BUSYBOX_CONFIG_HEXDUMP
          The hexdump utility is used to display binary data in a readable
          way that is comparable to the output from most hex editors.
 
          The hexdump utility is used to display binary data in a readable
          way that is comparable to the output from most hex editors.
 

+config BUSYBOX_CONFIG_FEATURE_HEXDUMP_REVERSE
+       bool "Support -R, reverse of 'hexdump -Cv'"
+       default n
+       depends on BUSYBOX_CONFIG_HEXDUMP
+       help
+         The hexdump utility is used to display binary data in an ascii
+         readable way. This option creates binary data from an ascii input.
+         NB: this option is non-standard. It's unwise to use it in scripts
+         aimed to be portable.
+
+config BUSYBOX_CONFIG_HD
+       bool "hd"
+       default n
+       depends on BUSYBOX_CONFIG_HEXDUMP
+       help
+         hd is an alias to hexdump -C.
+

 config BUSYBOX_CONFIG_HWCLOCK
        bool "hwclock"
        default y
 config BUSYBOX_CONFIG_HWCLOCK
        bool "hwclock"
        default y

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          The hwclock utility is used to read and set the hardware clock
        help
          The hwclock utility is used to read and set the hardware clock

-         on a system.  This is primarily used to set the current time on
+         on a system. This is primarily used to set the current time on

          shutdown in the hardware clock, so the hardware will keep the
          correct time when Linux is _not_ running.
 
 config BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS
        bool "Support long options (--hctosys,...)"
        default n
          shutdown in the hardware clock, so the hardware will keep the
          correct time when Linux is _not_ running.
 
 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
        help

-         By default, the hwclock utility only uses short options.  If you
+         By default, the hwclock utility only uses short options. If you

          are overly fond of its long options, such as --hctosys, --utc, etc)
          then enable this option.
 
 config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
        bool "Use FHS /var/lib/hwclock/adjtime"
          are overly fond of its long options, such as --hctosys, --utc, etc)
          then enable this option.
 
 config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
        bool "Use FHS /var/lib/hwclock/adjtime"

-       default n
+       default n  # util-linux-ng in Fedora 13 still uses /etc/adjtime

        depends on BUSYBOX_CONFIG_HWCLOCK
        help
          Starting with FHS 2.3, the adjtime state file is supposed to exist
        depends on BUSYBOX_CONFIG_HWCLOCK
        help
          Starting with FHS 2.3, the adjtime state file is supposed to exist

-         at /var/lib/hwclock/adjtime instead of /etc/adjtime.  If you wish
+         at /var/lib/hwclock/adjtime instead of /etc/adjtime. If you wish

          to use the FHS behavior, answer Y here, otherwise answer N for the
          classic /etc/adjtime path.
 
          to use the FHS behavior, answer Y here, otherwise answer N for the
          classic /etc/adjtime path.
 

-         http://www.pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
+         pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO

 
 config BUSYBOX_CONFIG_IPCRM
        bool "ipcrm"
        default n
 
 config BUSYBOX_CONFIG_IPCRM
        bool "ipcrm"
        default n

-       select BUSYBOX_CONFIG_FEATURE_SUID

        help
          The ipcrm utility allows the removal of System V interprocess
          communication (IPC) objects and the associated data structures
        help
          The ipcrm utility allows the removal of System V interprocess
          communication (IPC) objects and the associated data structures


@@ -252,7 +380,7 @@ config BUSYBOX_CONFIG_IPCRM
 config BUSYBOX_CONFIG_IPCS
        bool "ipcs"
        default n
 config BUSYBOX_CONFIG_IPCS
        bool "ipcs"
        default n

-       select BUSYBOX_CONFIG_FEATURE_SUID
+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          The ipcs utility is used to provide information on the currently
          allocated System V interprocess (IPC) objects in the system.
        help
          The ipcs utility is used to provide information on the currently
          allocated System V interprocess (IPC) objects in the system.


@@ -260,14 +388,36 @@ config BUSYBOX_CONFIG_IPCS
 config BUSYBOX_CONFIG_LOSETUP
        bool "losetup"
        default n
 config BUSYBOX_CONFIG_LOSETUP
        bool "losetup"
        default n

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          losetup is used to associate or detach a loop device with a regular
        help
          losetup is used to associate or detach a loop device with a regular

-         file or block device, and to query the status of a loop device.  This
+         file or block device, and to query the status of a loop device. This

          version does not currently support enabling data encryption.
 
          version does not currently support enabling data encryption.
 

+config BUSYBOX_CONFIG_LSPCI
+       bool "lspci"
+       default n
+       #select PLATFORM_LINUX
+       help
+         lspci is a utility for displaying information about PCI buses in the
+         system and devices connected to them.
+
+         This version uses sysfs (/sys/bus/pci/devices) only.
+
+config BUSYBOX_CONFIG_LSUSB
+       bool "lsusb"
+       default n
+       #select PLATFORM_LINUX
+       help
+         lsusb is a utility for displaying information about USB buses in the
+         system and devices connected to them.
+
+         This version uses sysfs (/sys/bus/usb/devices) only.
+

 config BUSYBOX_CONFIG_MDEV
        bool "mdev"
        default n
 config BUSYBOX_CONFIG_MDEV
        bool "mdev"
        default n

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          mdev is a mini-udev implementation for dynamically creating device
          nodes in the /dev directory.
        help
          mdev is a mini-udev implementation for dynamically creating device
          nodes in the /dev directory.


@@ -284,6 +434,23 @@ config BUSYBOX_CONFIG_FEATURE_MDEV_CONF
 
          For more information, please see docs/mdev.txt
 
 
          For more information, please see docs/mdev.txt
 

+config BUSYBOX_CONFIG_FEATURE_MDEV_RENAME
+       bool "Support subdirs/symlinks"
+       default n
+       depends on BUSYBOX_CONFIG_FEATURE_MDEV_CONF
+       help
+         Add support for renaming devices and creating symlinks.
+
+         For more information, please see docs/mdev.txt
+
+config BUSYBOX_CONFIG_FEATURE_MDEV_RENAME_REGEXP
+       bool "Support regular expressions substitutions when renaming device"
+       default n
+       depends on BUSYBOX_CONFIG_FEATURE_MDEV_RENAME
+       help
+         Add support for regular expressions substitutions when renaming
+         device.
+

 config BUSYBOX_CONFIG_FEATURE_MDEV_EXEC
        bool "Support command execution at device addition/removal"
        default n
 config BUSYBOX_CONFIG_FEATURE_MDEV_EXEC
        bool "Support command execution at device addition/removal"
        default n


@@ -310,69 +477,84 @@ config BUSYBOX_CONFIG_MKSWAP
        default n
        help
          The mkswap utility is used to configure a file or disk partition as
        default n
        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
+         Linux swap space. This allows Linux to use the entire file or

          partition as if it were additional RAM, which can greatly increase
          partition as if it were additional RAM, which can greatly increase

-         the capability of low-memory machines.  This additional memory is
+         the capability of low-memory machines. This additional memory is

          much slower than real RAM, but can be very helpful at preventing your
          applications being killed by the Linux out of memory (OOM) killer.
          Once you have created swap space using 'mkswap' you need to enable
          the swap space using the 'swapon' utility.
 
          much slower than real RAM, but can be very helpful at preventing your
          applications being killed by the Linux out of memory (OOM) killer.
          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
        default n
        depends on BUSYBOX_CONFIG_MKSWAP

-#      depends on MKSWAP && BUSYBOX_CONFIG_DEPRECATED

        help
        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"
        default n
        help
          more is a simple utility which allows you to read text one screen
 
 config BUSYBOX_CONFIG_MORE
        bool "more"
        default n
        help
          more is a simple utility which allows you to read text one screen

-         sized page at a time.  If you want to read text that is larger than
+         sized page at a time. If you want to read text that is larger than

          the screen, and you are using anything faster than a 300 baud modem,
          the screen, and you are using anything faster than a 300 baud modem,

-         you will probably find this utility very helpful.  If you don't have
+         you will probably find this utility very helpful. If you don't have

          any need to reading text files, you can leave this disabled.
 
          any need to reading text files, you can leave this disabled.
 

-config BUSYBOX_CONFIG_FEATURE_USE_TERMIOS
-       bool "Use termios to manipulate the screen"
-       default n
-       depends on BUSYBOX_CONFIG_MORE
-       help
-         This option allows utilities such as 'more' and 'top' to determine
-         the size of the screen.  If you leave this disabled, your utilities
-         that display things on the screen will be especially primitive and
-         will be unable to determine the current screen size, and will be
-         unable to move the cursor.
-

 config BUSYBOX_CONFIG_MOUNT
        bool "mount"
        default y
 config BUSYBOX_CONFIG_MOUNT
        bool "mount"
        default y

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          All files and filesystems in Unix are arranged into one big directory
        help
          All files and filesystems in Unix are arranged into one big directory

-         tree.  The 'mount' utility is used to graft a filesystem onto a
-         particular part of the tree.  A filesystem can either live on a block
+         tree. The 'mount' utility is used to graft a filesystem onto a
+         particular part of the tree. A filesystem can either live on a block

          device, or it can be accessible over the network, as is the case with
          device, or it can be accessible over the network, as is the case with

-         NFS filesystems.  Most people using BusyBox will also want to enable
+         NFS filesystems. Most people using BusyBox will also want to enable

          the 'mount' utility.
 
          the 'mount' utility.
 

+config BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE
+       bool "Support option -f"
+       default n
+       depends on BUSYBOX_CONFIG_MOUNT
+       help
+         Enable support for faking a file system mount.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE
+       bool "Support option -v"
+       default n
+       depends on BUSYBOX_CONFIG_MOUNT
+       help
+         Enable multi-level -v[vv...] verbose messages. Useful if you
+         debug mount problems and want to see what is exactly passed
+         to the kernel.
+

 config BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS
        bool "Support mount helpers"
 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.
        depends on BUSYBOX_CONFIG_MOUNT
        help
          Enable mounting of virtual file systems via external helpers.

-         E.g. mount obexfs#-b00.11.22.33.44.55 /mnt will in effect call
-         obexfs -b00.11.22.33.44.55 /mnt
-         The idea is to use such virtual filesystems in /etc/fstab
+         E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call
+         "obexfs -b00.11.22.33.44.55 /mnt"
+         Also "mount -t sometype [-o opts] fs /mnt" will try
+         "sometype [-o opts] fs /mnt" if simple mount syscall fails.
+         The idea is to use such virtual filesystems in /etc/fstab.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL
+       bool "Support specifying devices by label or UUID"
+       default n
+       depends on BUSYBOX_CONFIG_MOUNT
+       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 blkid/findfs.
+         This also enables label or uuid support for swapon.

 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
        bool "Support mounting NFS file systems"
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
        bool "Support mounting NFS file systems"

-       default y
+       default n

        depends on BUSYBOX_CONFIG_MOUNT
        select BUSYBOX_CONFIG_FEATURE_HAVE_RPC
        select BUSYBOX_CONFIG_FEATURE_SYSLOG
        depends on BUSYBOX_CONFIG_MOUNT
        select BUSYBOX_CONFIG_FEATURE_HAVE_RPC
        select BUSYBOX_CONFIG_FEATURE_SYSLOG


@@ -391,7 +573,7 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS
        bool "Support lots of -o flags in mount"
        default y
        help
        bool "Support lots of -o flags in mount"
        default y
        help

-         Without this, mount only supports ro/rw/remount.  With this, it
+         Without this, mount only supports ro/rw/remount. With this, it

          supports nosuid, suid, dev, nodev, exec, noexec, sync, async, atime,
          noatime, diratime, nodiratime, loud, bind, move, shared, slave,
          private, unbindable, rshared, rslave, rprivate, and runbindable.
          supports nosuid, suid, dev, nodev, exec, noexec, sync, async, atime,
          noatime, diratime, nodiratime, loud, bind, move, shared, slave,
          private, unbindable, rshared, rslave, rprivate, and runbindable.


@@ -406,80 +588,119 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_FSTAB
 config BUSYBOX_CONFIG_PIVOT_ROOT
        bool "pivot_root"
        default y
 config BUSYBOX_CONFIG_PIVOT_ROOT
        bool "pivot_root"
        default y

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          The pivot_root utility swaps the mount points for the root filesystem
        help
          The pivot_root utility swaps the mount points for the root filesystem

-         with some other mounted filesystem.  This allows you to do all sorts
+         with some other mounted filesystem. This allows you to do all sorts

          of wild and crazy things with your Linux system and is far more
          powerful than 'chroot'.
 
          of wild and crazy things with your Linux system and is far more
          powerful than 'chroot'.
 

-         Note: This is for initrd in linux 2.4.  Under initramfs (introduced
+         Note: This is for initrd in linux 2.4. Under initramfs (introduced

          in linux 2.6) use switch_root instead.
 
 config BUSYBOX_CONFIG_RDATE
        bool "rdate"
          in linux 2.6) use switch_root instead.
 
 config BUSYBOX_CONFIG_RDATE
        bool "rdate"

-       default y
+       default n

        help
          The rdate utility allows you to synchronize the date and time of your
          system clock with the date and time of a remote networked system using
          the RFC868 protocol, which is built into the inetd daemon on most
          systems.
 
        help
          The rdate utility allows you to synchronize the date and time of your
          system clock with the date and time of a remote networked system using
          the RFC868 protocol, which is built into the inetd daemon on most
          systems.
 

+config BUSYBOX_CONFIG_RDEV
+       bool "rdev"
+       default n
+       help
+         Print the device node associated with the filesystem mounted at '/'.
+

 config BUSYBOX_CONFIG_READPROFILE
        bool "readprofile"
        default n
 config BUSYBOX_CONFIG_READPROFILE
        bool "readprofile"
        default n

+       #select PLATFORM_LINUX

        help
          This allows you to parse /proc/profile for basic profiling.
 
        help
          This allows you to parse /proc/profile for basic profiling.
 

+config BUSYBOX_CONFIG_RTCWAKE
+       bool "rtcwake"
+       default n
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       help
+         Enter a system sleep state until specified wakeup time.
+
+config BUSYBOX_CONFIG_SCRIPT
+       bool "script"
+       default n
+       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
 config BUSYBOX_CONFIG_SETARCH
        bool "setarch"
        default n

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          The linux32 utility is used to create a 32bit environment for the
        help
          The linux32 utility is used to create a 32bit environment for the

-         specified program (usually a shell).  It only makes sense to have
+         specified program (usually a shell). It only makes sense to have

          this util on a system that supports both 64bit and 32bit userland
          (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
 
 config BUSYBOX_CONFIG_SWAPONOFF
        bool "swaponoff"
        default n
          this util on a system that supports both 64bit and 32bit userland
          (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
 
 config BUSYBOX_CONFIG_SWAPONOFF
        bool "swaponoff"
        default n

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          This option enables both the 'swapon' and the 'swapoff' utilities.
          Once you have created some swap space using 'mkswap', you also need
        help
          This option enables both the 'swapon' and the 'swapoff' utilities.
          Once you have created some swap space using 'mkswap', you also need

-         to enable your swap space with the 'swapon' utility.  The 'swapoff'
+         to enable your swap space with the 'swapon' utility. The 'swapoff'

          utility is used, typically at system shutdown, to disable any swap
          utility is used, typically at system shutdown, to disable any swap

-         space.  If you are not using any swap space, you can leave this
+         space. If you are not using any swap space, you can leave this

          option disabled.
 
          option disabled.
 

+config BUSYBOX_CONFIG_FEATURE_SWAPON_PRI
+       bool "Support priority option -p"
+       default n
+       depends on BUSYBOX_CONFIG_SWAPONOFF
+       help
+         Enable support for setting swap device priority in swapon.
+

 config BUSYBOX_CONFIG_SWITCH_ROOT
        bool "switch_root"
        default y
 config BUSYBOX_CONFIG_SWITCH_ROOT
        bool "switch_root"
        default y

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          The switch_root utility is used from initramfs to select a new
        help
          The switch_root utility is used from initramfs to select a new

-         root device.  Under initramfs, you have to use this instead of
-         pivot_root.  (Stop reading here if you don't care why.)
+         root device. Under initramfs, you have to use this instead of
+         pivot_root. (Stop reading here if you don't care why.)

 
          Booting with initramfs extracts a gzipped cpio archive into rootfs
 
          Booting with initramfs extracts a gzipped cpio archive into rootfs

-         (which is a variant of ramfs/tmpfs).  Because rootfs can't be moved
-         or unmounted*, pivot_root will not work from initramfs.  Instead,
+         (which is a variant of ramfs/tmpfs). Because rootfs can't be moved
+         or unmounted*, pivot_root will not work from initramfs. Instead,

          switch_root deletes everything out of rootfs (including itself),
          does a mount --move that overmounts rootfs with the new root, and
          then execs the specified init program.
 
          * Because the Linux kernel uses rootfs internally as the starting
          and ending point for searching through the kernel's doubly linked
          switch_root deletes everything out of rootfs (including itself),
          does a mount --move that overmounts rootfs with the new root, and
          then execs the specified init program.
 
          * Because the Linux kernel uses rootfs internally as the starting
          and ending point for searching through the kernel's doubly linked

-         list of active mount points.  That's why.
+         list of active mount points. That's why.

 
 config BUSYBOX_CONFIG_UMOUNT
        bool "umount"
        default y
 
 config BUSYBOX_CONFIG_UMOUNT
        bool "umount"
        default y

+       select BUSYBOX_CONFIG_PLATFORM_LINUX

        help
        help

-         When you want to remove a mounted filesystem from its current mount point,
-         for example when you are shutting down the system, the 'umount' utility is
-         the tool to use.  If you enabled the 'mount' utility, you almost certainly
-         also want to enable 'umount'.
+         When you want to remove a mounted filesystem from its current mount
+         point, for example when you are shutting down the system, the
+         'umount' utility is the tool to use. If you enabled the 'mount'
+         utility, you almost certainly also want to enable 'umount'.

 
 config BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL
 
 config BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL

-       bool "umount -a option"
+       bool "Support option -a"

        default y
        depends on BUSYBOX_CONFIG_UMOUNT
        help
        default y
        depends on BUSYBOX_CONFIG_UMOUNT
        help


@@ -494,25 +715,39 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP
        depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
        help
          Enabling this feature allows automatic mounting of files (containing
        depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
        help
          Enabling this feature allows automatic mounting of files (containing

-         filesystem images) via the linux kernel's loopback devices.  The mount
-         command will detect you are trying to mount a file instead of a block
-         device, and transparently associate the file with a loopback device.
-         The umount command will also free that loopback device.
+         filesystem images) via the linux kernel's loopback devices.
+         The mount command will detect you are trying to mount a file instead
+         of a block device, and transparently associate the file with a
+         loopback device. The umount command will also free that loopback
+         device.

 
          You can still use the 'losetup' utility (to manually associate files
          with loop devices) if you need to do something advanced, such as
          specify an offset or cryptographic options to the loopback device.
          (If you don't want umount to free the loop device, use "umount -D".)
 
 
          You can still use the 'losetup' utility (to manually associate files
          with loop devices) if you need to do something advanced, such as
          specify an offset or cryptographic options to the loopback device.
          (If you don't want umount to free the loop device, use "umount -D".)
 

+config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP_CREATE
+       bool "Create new loopback devices if needed"
+       default n
+       depends on BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP
+       help
+         Linux kernels >= 2.6.24 support unlimited loopback devices. They are
+         allocated for use when trying to use a loop device. The loop device
+         must however exist.
+
+         This feature lets mount to try to create next /dev/loopN device
+         if it does not find a free one.
+

 config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT
        bool "Support for the old /etc/mtab file"
        default n
        depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
 config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT
        bool "Support for the old /etc/mtab file"
        default n
        depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT

+       select BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE

        help
          Historically, Unix systems kept track of the currently mounted
        help
          Historically, Unix systems kept track of the currently mounted

-         partitions in the file "/etc/mtab".  These days, the kernel exports
+         partitions in the file "/etc/mtab". These days, the kernel exports

          the list of currently mounted partitions in "/proc/mounts", rendering
          the list of currently mounted partitions in "/proc/mounts", rendering

-         the old mtab file obsolete.  (In modern systems, /etc/mtab should be
+         the old mtab file obsolete. (In modern systems, /etc/mtab should be

          a symlink to /proc/mounts.)
 
          The only reason to have mount maintain an /etc/mtab file itself is if
          a symlink to /proc/mounts.)
 
          The only reason to have mount maintain an /etc/mtab file itself is if


@@ -520,12 +755,231 @@ config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT
          If you must use this, keep in mind it's inherently brittle (for
          example a mount under chroot won't update it), can't handle modern
          features like separate per-process filesystem namespaces, requires
          If you must use this, keep in mind it's inherently brittle (for
          example a mount under chroot won't update it), can't handle modern
          features like separate per-process filesystem namespaces, requires

-         that your /etc directory be writeable, tends to get easily confused
+         that your /etc directory be writable, tends to get easily confused

          by --bind or --move mounts, won't update if you rename a directory
          by --bind or --move mounts, won't update if you rename a directory

-         that contains a mount point, and so on.  (In brief: avoid.)
+         that contains a mount point, and so on. (In brief: avoid.)

 
          About the only reason to use this is if you've removed /proc from
          your kernel.
 
 
          About the only reason to use this is if you've removed /proc from
          your kernel.
 

+config BUSYBOX_CONFIG_VOLUMEID
+       bool #No description makes it a hidden option
+       default n
+
+menu "Filesystem/Volume identification"
+       depends on BUSYBOX_CONFIG_VOLUMEID
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT
+       bool "Ext filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS
+       bool "btrfs filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS
+       bool "Reiser filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT
+       bool "fat filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS
+       bool "hfs filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS
+       bool "jfs filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+### config FEATURE_VOLUMEID_UFS
+###    bool "ufs filesystem"
+###    default y
+###    depends on VOLUMEID
+###    help
+###      TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS
+       bool "xfs filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS
+       bool "ntfs filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660
+       bool "iso9660 filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF
+       bool "udf filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LUKS
+       bool "luks filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP
+       bool "linux swap filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+### config FEATURE_VOLUMEID_LVM
+###    bool "lvm"
+###    default y
+###    depends on VOLUMEID
+###    help
+###      TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_CRAMFS
+       bool "cramfs filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+### config FEATURE_VOLUMEID_HPFS
+###    bool "hpfs filesystem"
+###    default y
+###    depends on VOLUMEID
+###    help
+###      TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_ROMFS
+       bool "romfs filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_SYSV
+       bool "sysv filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_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 BUSYBOX_CONFIG_FEATURE_VOLUMEID_OCFS2
+       bool "ocfs2 filesystem"
+       default n
+       depends on BUSYBOX_CONFIG_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 BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXRAID
+       bool "linuxraid"
+       default n
+       depends on BUSYBOX_CONFIG_VOLUMEID
+       help
+         TODO
+

 endmenu
 
 endmenu
 

+endmenu