[kernel] nefilter: fix chaostables on 2.6.24

[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 474ef02..a7e4467 100644 (file)
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -17,6 +17,26 @@ config BUSYBOX_CONFIG_DMESG
          are also logged to the system console.  Enable this option if you
          wish to enable the 'dmesg' utility.
 
          are also logged to the system console.  Enable this option if you
          wish to enable the 'dmesg' utility.
 

+config BUSYBOX_CONFIG_FEATURE_DMESG_PRETTY
+       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.
+         The syslog level is a string prefixed to every line with the form "<#>".
+
+         With this option you will see:
+           # dmesg
+           Linux version 2.6.17.4 .....
+           BIOS-provided physical RAM map:
+            BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+
+         Without this option you will see:
+           # dmesg
+           <5>Linux version 2.6.17.4 .....
+           <6>BIOS-provided physical RAM map:
+           <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+

 config BUSYBOX_CONFIG_FBSET
        bool "fbset"
        default n
 config BUSYBOX_CONFIG_FBSET
        bool "fbset"
        default n


@@ -27,7 +47,7 @@ config BUSYBOX_CONFIG_FBSET
          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

-       bool "  Turn on extra fbset options"
+       bool "Turn on extra fbset options"

        default n
        depends on BUSYBOX_CONFIG_FBSET
        help
        default n
        depends on BUSYBOX_CONFIG_FBSET
        help


@@ -37,7 +57,7 @@ config BUSYBOX_CONFIG_FEATURE_FBSET_FANCY
          options.
 
 config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE
          options.
 
 config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE

-       bool "  Turn on fbset readmode support"
+       bool "Turn on fbset readmode support"

        default n
        depends on BUSYBOX_CONFIG_FBSET
        help
        default n
        depends on BUSYBOX_CONFIG_FBSET
        help


@@ -72,15 +92,15 @@ config BUSYBOX_CONFIG_FDISK
          can be used to list and edit the set of partitions or BSD style
          'disk slices' that are defined on a hard drive.
 
          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_FDISK_SUPPORT_LARGE_DISKS
-       bool
+config BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS
+       bool "support over 4GB disks"

        default y
        depends on BUSYBOX_CONFIG_FDISK
        help
          Enable this option to support large disks > 4GB.
 
 config BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
        default y
        depends on BUSYBOX_CONFIG_FDISK
        help
          Enable this option to support large disks > 4GB.
 
 config BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE

-       bool "  Write support"
+       bool "Write support"

        default n
        depends on BUSYBOX_CONFIG_FDISK
        help
        default n
        depends on BUSYBOX_CONFIG_FDISK
        help


@@ -89,7 +109,7 @@ config BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
          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

-       bool "  Support AIX disklabels"
+       bool "Support AIX disklabels"

        default n
        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
        help
        default n
        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
        help


@@ -97,7 +117,7 @@ config BUSYBOX_CONFIG_FEATURE_AIX_LABEL
          Most people can safely leave this option disabled.
 
 config BUSYBOX_CONFIG_FEATURE_SGI_LABEL
          Most people can safely leave this option disabled.
 
 config BUSYBOX_CONFIG_FEATURE_SGI_LABEL

-       bool "  Support SGI disklabels"
+       bool "Support SGI disklabels"

        default n
        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
        help
        default n
        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
        help


@@ -105,15 +125,15 @@ config BUSYBOX_CONFIG_FEATURE_SGI_LABEL
          Most people can safely leave this option disabled.
 
 config BUSYBOX_CONFIG_FEATURE_SUN_LABEL
          Most people can safely leave this option disabled.
 
 config BUSYBOX_CONFIG_FEATURE_SUN_LABEL

-       bool "  Support SUN disklabels"
+       bool "Support SUN disklabels"

        default n
        default n

-       depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
+       depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE

        help
          Enabling this option allows you to create or change SUN disklabels.
          Most people can safely leave this option disabled.
 
 config BUSYBOX_CONFIG_FEATURE_OSF_LABEL
        help
          Enabling this option allows you to create or change SUN disklabels.
          Most people can safely leave this option disabled.
 
 config BUSYBOX_CONFIG_FEATURE_OSF_LABEL

-       bool "  Support BSD disklabels"
+       bool "Support BSD disklabels"

        default n
        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
        help
        default n
        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
        help


@@ -121,7 +141,7 @@ config BUSYBOX_CONFIG_FEATURE_OSF_LABEL
          and define and edit BSD disk slices.
 
 config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED
          and define and edit BSD disk slices.
 
 config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED

-       bool "  Support expert mode"
+       bool "Support expert mode"

        default n
        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
        help
        default n
        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
        help


@@ -161,10 +181,10 @@ config BUSYBOX_CONFIG_MKFS_MINIX
          this utility will do the job for you.
 
 comment "Minix filesystem support"
          this utility will do the job for you.
 
 comment "Minix filesystem support"

-    depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
+       depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX

 
 config BUSYBOX_CONFIG_FEATURE_MINIX2
 
 config BUSYBOX_CONFIG_FEATURE_MINIX2

-       bool "  Support Minix fs v2 (fsck_minix/mkfs_minix)"
+       bool "Support Minix fs v2 (fsck_minix/mkfs_minix)"

        default n
        depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
        help
        default n
        depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
        help


@@ -192,24 +212,24 @@ config BUSYBOX_CONFIG_HEXDUMP
 
 config BUSYBOX_CONFIG_HWCLOCK
        bool "hwclock"
 
 config BUSYBOX_CONFIG_HWCLOCK
        bool "hwclock"

-       default n
+       default y

        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
          shutdown in the hardware clock, so the hardware will keep the
          correct time when Linux is _not_ running.
 
        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
          shutdown in the hardware clock, so the hardware will keep the
          correct time when Linux is _not_ running.
 

-config BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONGOPTIONS
-       bool "  Support long options (--hctosys,...)"
+config BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS
+       bool "Support long options (--hctosys,...)"

        default n
        default n

-       depends on BUSYBOX_CONFIG_HWCLOCK
+       depends on BUSYBOX_CONFIG_HWCLOCK && BUSYBOX_CONFIG_GETOPT_LONG

        help
          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
        help
          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"
+       bool "Use FHS /var/lib/hwclock/adjtime"

        default n
        depends on BUSYBOX_CONFIG_HWCLOCK
        help
        default n
        depends on BUSYBOX_CONFIG_HWCLOCK
        help


@@ -249,31 +269,41 @@ config BUSYBOX_CONFIG_MDEV
        bool "mdev"
        default n
        help
        bool "mdev"
        default n
        help

-         mdev is a mini-udev implementation: call it with -s to populate
-         /dev from /sys, then "echo /sbin/mdev > /proc/sys/kernel/hotplug" to
-         have it handle hotplug events afterwards.  Device names are taken
-         from sysfs.
+         mdev is a mini-udev implementation for dynamically creating device
+         nodes in the /dev directory.
+
+         For more information, please see docs/mdev.txt

 
 config BUSYBOX_CONFIG_FEATURE_MDEV_CONF
 
 config BUSYBOX_CONFIG_FEATURE_MDEV_CONF

-       bool "  Support /etc/mdev.conf"
+       bool "Support /etc/mdev.conf"

        default n
        depends on BUSYBOX_CONFIG_MDEV
        help
        default n
        depends on BUSYBOX_CONFIG_MDEV
        help

-         The mdev config file contains lines that look like:
+         Add support for the mdev config file to control ownership and
+         permissions of the device nodes.

 
 

-           hd[a-z][0-9]* 0:3 660
+         For more information, please see docs/mdev.txt

 
 

-         That's device name (with regex match), uid:gid, and permissions.
+config BUSYBOX_CONFIG_FEATURE_MDEV_EXEC
+       bool "Support command execution at device addition/removal"
+       default n
+       depends on BUSYBOX_CONFIG_FEATURE_MDEV_CONF
+       help
+         This adds support for an optional field to /etc/mdev.conf for
+         executing commands when devices are created/removed.

 
 

-         Optionally, that can be followed (on the same line) by an asterisk
-         and a command line to run after creating the corresponding device(s),
-         ala:
+         For more information, please see docs/mdev.txt

 
 

-           hdc root:cdrom 660  *ln -s hdc cdrom
+config BUSYBOX_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE
+       bool "Support loading of firmwares"
+       default n
+       depends on BUSYBOX_CONFIG_MDEV
+       help
+         Some devices need to load firmware before they can be usable.

 
 

-         Config file parsing stops on the first matching line.  If no config
-         entry is matched, devices are created with default 0:0 660.  (Make
-         the last line match .* to override this.)
+         These devices will request userspace look up the files in
+         /lib/firmware/ and if it exists, send it to the kernel for
+         loading into the hardware.

 
 config BUSYBOX_CONFIG_MKSWAP
        bool "mkswap"
 
 config BUSYBOX_CONFIG_MKSWAP
        bool "mkswap"


@@ -288,9 +318,19 @@ config BUSYBOX_CONFIG_MKSWAP
          Once you have created swap space using 'mkswap' you need to enable
          the swap space using the 'swapon' utility.
 
          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
+       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.
+

 config BUSYBOX_CONFIG_MORE
        bool "more"
 config BUSYBOX_CONFIG_MORE
        bool "more"

-       default y
+       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
        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


@@ -299,8 +339,8 @@ config BUSYBOX_CONFIG_MORE
          any need to reading text files, you can leave this disabled.
 
 config BUSYBOX_CONFIG_FEATURE_USE_TERMIOS
          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 y
+       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
        depends on BUSYBOX_CONFIG_MORE
        help
          This option allows utilities such as 'more' and 'top' to determine


@@ -320,12 +360,48 @@ config BUSYBOX_CONFIG_MOUNT
          NFS filesystems.  Most people using BusyBox will also want to enable
          the 'mount' utility.
 
          NFS filesystems.  Most people using BusyBox will also want to enable
          the 'mount' utility.
 

+config BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS
+       bool "Support mount helpers"
+       default n
+       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
+

 config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
 config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS

-       bool "  Support mounting NFS file systems"
+       bool "Support mounting NFS file systems"
+       default y
+       depends on BUSYBOX_CONFIG_MOUNT
+       select BUSYBOX_CONFIG_FEATURE_HAVE_RPC
+       select BUSYBOX_CONFIG_FEATURE_SYSLOG
+       help
+         Enable mounting of NFS file systems.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_CIFS
+       bool "Support mounting CIFS/SMB file systems"
+       default y
+       depends on BUSYBOX_CONFIG_MOUNT
+       help
+         Enable support for samba mounts.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS
+       depends on BUSYBOX_CONFIG_MOUNT
+       bool "Support lots of -o flags in mount"

        default y
        default y

+       help
+         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.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_FSTAB

        depends on BUSYBOX_CONFIG_MOUNT
        depends on BUSYBOX_CONFIG_MOUNT

+       bool "Support /etc/fstab and -a"
+       default y

        help
        help

-        Enable mounting of NFS file systems.
+         Support mount all and looking for files in /etc/fstab.

 
 config BUSYBOX_CONFIG_PIVOT_ROOT
        bool "pivot_root"
 
 config BUSYBOX_CONFIG_PIVOT_ROOT
        bool "pivot_root"


@@ -403,7 +479,7 @@ config BUSYBOX_CONFIG_UMOUNT
          also want to enable 'umount'.
 
 config BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL
          also want to enable 'umount'.
 
 config BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL

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

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


@@ -413,7 +489,7 @@ comment "Common options for mount/umount"
        depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP
        depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP

-       bool "  Support loopback mounts"
+       bool "Support loopback mounts"

        default y
        depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
        help
        default y
        depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
        help


@@ -424,12 +500,12 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP
          The umount command will also free that loopback device.
 
          You can still use the 'losetup' utility (to manually associate files
          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
+         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_MTAB_SUPPORT
          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_MTAB_SUPPORT

-       bool "  Support for the old /etc/mtab file"
+       bool "Support for the old /etc/mtab file"

        default n
        depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
        help
        default n
        depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
        help


@@ -445,7 +521,11 @@ config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT
          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
          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

-         by --bind or --move mounts, and so on.  (In brief: avoid.)
+         by --bind or --move mounts, won't update if you rename a directory
+         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.

 
 endmenu
 
 
 endmenu