Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (16 years ago)
Author:
Bruno Cornec
Message:
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/mindi-busybox/networking/Config.in

    r821 r1770  
    66menu "Networking Utilities"
    77
    8 config CONFIG_FEATURE_IPV6
     8config FEATURE_IPV6
    99    bool "Enable IPv6 support"
    1010    default n
    … …  
    1313      This adds IPv6 support in the networking applets.
    1414
    15 config CONFIG_ARPING
     15config VERBOSE_RESOLUTION_ERRORS
     16    bool "Verbose resolution errors"
     17    default n
     18    help
     19      Enable if you are not satisfied with simplistic
     20      "can't resolve 'hostname.com'" and want to know more.
     21      This may increase size of your executable a bit.
     22
     23config ARP
     24    bool "arp"
     25    default n
     26    help
     27      Manipulate the system ARP cache.
     28
     29config ARPING
    1630    bool "arping"
    1731    default n
    1832    help
    19       Ping hosts by ARP packets
    20 
    21 config CONFIG_DNSD
     33      Ping hosts by ARP packets.
     34
     35config DNSD
    2236    bool "dnsd"
    2337    default n
    2438    help
    25       Small and static DNS server daemon. 
    26 
    27 config CONFIG_ETHER_WAKE
     39      Small and static DNS server daemon.
     40
     41config ETHER_WAKE
    2842    bool "ether-wake"
    2943    default n
    … …  
    3145      Send a magic packet to wake up sleeping machines.
    3246
    33 config CONFIG_FAKEIDENTD
     47config FAKEIDENTD
    3448    bool "fakeidentd"
    3549    default n
     50    select FEATURE_SYSLOG
    3651    help
    3752      fakeidentd listens on the ident port and returns a predefined
    3853      fake value on any query.
    3954
    40 config CONFIG_FTPGET
     55config FTPGET
    4156    bool "ftpget"
    4257    default n
    … …  
    4459      Retrieve a remote file via FTP.
    4560
    46 config CONFIG_FTPPUT
     61config FTPPUT
    4762    bool "ftpput"
    4863    default n
    … …  
    5065      Store a remote file via FTP.
    5166
    52 config CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS
     67config FEATURE_FTPGETPUT_LONG_OPTIONS
    5368    bool "Enable long options in ftpget/ftpput"
    5469    default n
    55     depends on CONFIG_GETOPT_LONG && (CONFIG_FTPGET || CONFIG_FTPPUT)
     70    depends on GETOPT_LONG && (FTPGET || FTPPUT)
    5671    help
    5772      Support long options for the ftpget/ftpput applet.
    5873
    59 config CONFIG_HOSTNAME
     74config HOSTNAME
    6075    bool "hostname"
    6176    default n
    6277    help
    63       Show or set the system's host name
    64 
    65 config CONFIG_HTTPD
     78      Show or set the system's host name.
     79
     80config HTTPD
    6681    bool "httpd"
    6782    default n
    … …  
    6984      Serve web pages via an HTTP server.
    7085
    71 config CONFIG_FEATURE_HTTPD_WITHOUT_INETD
    72     bool "Support using httpd as a daemon (not from inetd)"
    73     default n
    74     depends on CONFIG_HTTPD
    75     help
    76       This option enables uid and port options for the httpd applet,
    77       and eliminates the need to be called from the inetd server daemon.
    78 
    79 config CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
     86config FEATURE_HTTPD_USE_SENDFILE
     87    bool "Use sendfile system call"
     88    default n
     89    depends on HTTPD
     90    help
     91      When enabled, httpd will use the kernel sendfile() function
     92      instead of read/write loop.
     93
     94config FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
    8095    bool "Support reloading the global config file using hup signal"
    8196    default n
    82     depends on CONFIG_HTTPD && CONFIG_FEATURE_HTTPD_WITHOUT_INETD
     97    depends on HTTPD
    8398    help
    8499      This option enables processing of SIGHUP to reload cached
    85100      configuration settings.
    86101
    87 config CONFIG_FEATURE_HTTPD_SETUID
    88     bool "Enable support -u <user> option"
    89     default n
    90     depends on CONFIG_HTTPD && CONFIG_FEATURE_HTTPD_WITHOUT_INETD
     102config FEATURE_HTTPD_SETUID
     103    bool "Enable -u <user> option"
     104    default n
     105    depends on HTTPD
    91106    help
    92107      This option allows the server to run as a specific user
    … …  
    95110      different user.
    96111
    97 config CONFIG_FEATURE_HTTPD_BASIC_AUTH
     112config FEATURE_HTTPD_BASIC_AUTH
    98113    bool "Enable Basic http Authentication"
    99114    default y
    100     depends on CONFIG_HTTPD
     115    depends on HTTPD
    101116    help
    102117      Utilizes password settings from /etc/httpd.conf for basic
    103118      authentication on a per url basis.
    104119
    105 config CONFIG_FEATURE_HTTPD_AUTH_MD5
     120config FEATURE_HTTPD_AUTH_MD5
    106121    bool "Support MD5 crypted passwords for http Authentication"
    107122    default n
    108     depends on CONFIG_FEATURE_HTTPD_BASIC_AUTH
     123    depends on FEATURE_HTTPD_BASIC_AUTH
    109124    help
    110125      Enables basic per URL authentication from /etc/httpd.conf
    111126      using md5 passwords.
    112127
    113 config CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
     128config FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
    114129    bool "Support loading additional MIME types at run-time"
    115130    default n
    116     depends on CONFIG_HTTPD
     131    depends on HTTPD
    117132    help
    118133      This option enables support for additional MIME types at
    119134      run-time to be specified in the configuration file.
    120135
    121 config CONFIG_FEATURE_HTTPD_CGI
     136config FEATURE_HTTPD_CGI
    122137    bool "Support Common Gateway Interface (CGI)"
    123138    default y
    124     depends on CONFIG_HTTPD
     139    depends on HTTPD
    125140    help
    126141      This option allows scripts and executables to be invoked
    127142      when specific URLs are requested.
    128143
    129 config CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
     144config FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
    130145    bool "Enable support for running scripts through an interpreter"
    131146    default n
    132     depends on CONFIG_FEATURE_HTTPD_CGI
    133     help
    134       This option enables support for running scripts through an 
    135       interpreter. Turn this on if you want PHP scripts to work 
    136       properly. You need to supply an addition line in your httpd
     147    depends on FEATURE_HTTPD_CGI
     148    help
     149      This option enables support for running scripts through an
     150      interpreter. Turn this on if you want PHP scripts to work
     151      properly. You need to supply an additional line in your httpd
    137152      config file:
    138153      *.php:/path/to/your/php
    139154
    140 config CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
     155config FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
    141156    bool "Support the REMOTE_PORT environment variable for CGI"
    142157    default n
    143     depends on CONFIG_FEATURE_HTTPD_CGI
     158    depends on FEATURE_HTTPD_CGI
    144159    help
    145160      Use of this option can assist scripts in generating
    146161      references that contain a unique port number.
    147162
    148 config CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
     163config FEATURE_HTTPD_ENCODE_URL_STR
    149164    bool "Enable the -e option for shell script CGI simplification."
    150165    default y
    151     depends on CONFIG_HTTPD
     166    depends on HTTPD
    152167    help
    153168      This option allows html encoding arbitrary
    … …  
    156171      "&#60Hello&#32World&#62".
    157172
    158 config CONFIG_IFCONFIG
     173config FEATURE_HTTPD_ERROR_PAGES
     174    bool "Enable support for custom error pages"
     175    default n
     176    depends on HTTPD
     177    help
     178      This option allows you to define custom error pages in
     179      the configuration file instead of the default HTTP status
     180      error pages. For instance, if you add the line:
     181            E404:/path/e404.html
     182      in the config file, the server will respond the specified
     183      '/path/e404.html' file instead of the terse '404 NOT FOUND'
     184      message.
     185
     186config IFCONFIG
    159187    bool "ifconfig"
    160188    default n
    … …  
    162190      Ifconfig is used to configure the kernel-resident network interfaces.
    163191
    164 config CONFIG_FEATURE_IFCONFIG_STATUS
     192config FEATURE_IFCONFIG_STATUS
    165193    bool "Enable status reporting output (+7k)"
    166194    default y
    167     depends on CONFIG_IFCONFIG
     195    depends on IFCONFIG
    168196    help
    169197      If ifconfig is called with no arguments it will display the status
    170198      of the currently active interfaces.
    171199
    172 config CONFIG_FEATURE_IFCONFIG_SLIP
     200config FEATURE_IFCONFIG_SLIP
    173201    bool "Enable slip-specific options \"keepalive\" and \"outfill\""
    174202    default n
    175     depends on CONFIG_IFCONFIG
     203    depends on IFCONFIG
    176204    help
    177205      Allow "keepalive" and "outfill" support for SLIP.  If you're not
    178206      planning on using serial lines, leave this unchecked.
    179207
    180 config CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
     208config FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
    181209    bool "Enable options \"mem_start\", \"io_addr\", and \"irq\""
    182210    default n
    183     depends on CONFIG_IFCONFIG
     211    depends on IFCONFIG
    184212    help
    185213      Allow the start address for shared memory, start address for I/O,
    186214      and/or the interrupt line used by the specified device.
    187215
    188 config CONFIG_FEATURE_IFCONFIG_HW
     216config FEATURE_IFCONFIG_HW
    189217    bool "Enable option \"hw\" (ether only)"
    190218    default y
    191     depends on CONFIG_IFCONFIG
     219    depends on IFCONFIG
    192220    help
    193221      Set the hardware address of this interface, if the device driver
    … …  
    195223      class.
    196224
    197 config CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
     225config FEATURE_IFCONFIG_BROADCAST_PLUS
    198226    bool "Set the broadcast automatically"
    199227    default n
    200     depends on CONFIG_IFCONFIG
     228    depends on IFCONFIG
    201229    help
    202230      Setting this will make ifconfig attempt to find the broadcast
    203231      automatically if the value '+' is used.
    204232
    205 config CONFIG_IFUPDOWN
     233config IFUPDOWN
    206234    bool "ifupdown"
    207235    default n
    208     select CONFIG_RUN_PARTS
    209236    help
    210237      Activate or deactivate the specified interfaces.  This applet makes
    211238      use of either "ifconfig" and "route" or the "ip" command to actually
    212239      configure network interfaces.  Therefore, you will probably also want
    213       to enable either CONFIG_IFCONFIG and CONFIG_ROUTE, or enable
    214       CONFIG_FEATURE_IFUPDOWN_IP and the various CONFIG_IP options.  Of
     240      to enable either IFCONFIG and ROUTE, or enable
     241      FEATURE_IFUPDOWN_IP and the various IP options.  Of
    215242      course you could use non-busybox versions of these programs, so
    216243      against my better judgement (since this will surely result in plenty
    217244      of support questions on the mailing list), I do not force you to
    218245      enable these additional options.  It is up to you to supply either
    219       "ifconfig" and "route" or the "ip" command, either via busybox or via
    220       standalone utilities.
    221 
    222 config CONFIG_FEATURE_IFUPDOWN_IP
     246      "ifconfig", "route" and "run-parts" or the "ip" command, either
     247      via busybox or via standalone utilities.
     248
     249config IFUPDOWN_IFSTATE_PATH
     250    string "Absolute path to ifstate file"
     251    default "/var/run/ifstate"
     252    help
     253      ifupdown keeps state information in a file called ifstate.
     254      Typically it is located in /var/run/ifstate, however
     255      some distributions tend to put it in other places
     256      (debian, for example, uses /etc/network/run/ifstate).
     257      This config option defines location of ifstate.
     258
     259config FEATURE_IFUPDOWN_IP
    223260    bool "Use ip applet"
    224261    default n
    225     depends on CONFIG_IFUPDOWN
     262    depends on IFUPDOWN
    226263    help
    227264      Use the iproute "ip" command to implement "ifup" and "ifdown", rather
    228265      than the default of using the older 'ifconfig' and 'route' utilities.
    229266
    230 config CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
     267config FEATURE_IFUPDOWN_IP_BUILTIN
    231268    bool "Use busybox ip applet"
    232269    default y
    233     depends on CONFIG_FEATURE_IFUPDOWN_IP
    234     select CONFIG_IP
    235     select CONFIG_FEATURE_IP_ADDRESS
    236     select CONFIG_FEATURE_IP_LINK
    237     select CONFIG_FEATURE_IP_ROUTE
     270    depends on FEATURE_IFUPDOWN_IP
     271    select IP
     272    select FEATURE_IP_ADDRESS
     273    select FEATURE_IP_LINK
     274    select FEATURE_IP_ROUTE
    238275    help
    239276      Use the busybox iproute "ip" applet to implement "ifupdown".
    240277
    241       If leave this disabled, you must install the full-blown iproute2
     278      If left disabled, you must install the full-blown iproute2
    242279      utility or the  "ifup" and "ifdown" applets will not work.
    243280
    244 config CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
     281config FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
    245282    bool "Use busybox ifconfig and route applets"
    246283    default y
    247     depends on CONFIG_IFUPDOWN && !CONFIG_FEATURE_IFUPDOWN_IP
    248     select CONFIG_IFCONFIG
    249     select CONFIG_ROUTE
     284    depends on IFUPDOWN && !FEATURE_IFUPDOWN_IP
     285    select IFCONFIG
     286    select ROUTE
    250287    help
    251288      Use the busybox iproute "ifconfig" and "route" applets to
    252289      implement the "ifup" and "ifdown" utilities.
    253290
    254       If leave this disabled, you must install the full-blown ifconfig
     291      If left disabled, you must install the full-blown ifconfig
    255292      and route utilities, or the  "ifup" and "ifdown" applets will not
    256293      work.
    257294
    258 config CONFIG_FEATURE_IFUPDOWN_IPV4
     295config FEATURE_IFUPDOWN_IPV4
    259296    bool "Enable support for IPv4"
    260297    default y
    261     depends on CONFIG_IFUPDOWN
    262     help
    263       If you want busybox to talk IPv4, leave this on.
    264 
    265 config CONFIG_FEATURE_IFUPDOWN_IPV6
     298    depends on IFUPDOWN
     299    help
     300      If you want ifup/ifdown to talk IPv4, leave this on.
     301
     302config FEATURE_IFUPDOWN_IPV6
    266303    bool "Enable support for IPv6"
    267304    default n
    268     depends on CONFIG_IFUPDOWN && CONFIG_FEATURE_IPV6
     305    depends on IFUPDOWN && FEATURE_IPV6
    269306    help
    270307      If you need support for IPv6, turn this option on.
    271308
    272 config CONFIG_FEATURE_IFUPDOWN_IPX
    273     bool "Enable support for IPX"
    274     default n
    275     depends on CONFIG_IFUPDOWN
    276     help
    277       If this option is selected you can use busybox to work with IPX
    278       networks.
    279 
    280 config CONFIG_FEATURE_IFUPDOWN_MAPPING
     309### UNUSED
     310### config FEATURE_IFUPDOWN_IPX
     311###     bool "Enable support for IPX"
     312###     default n
     313###     depends on IFUPDOWN
     314###     help
     315###       If this option is selected you can use busybox to work with IPX
     316###       networks.
     317
     318config FEATURE_IFUPDOWN_MAPPING
    281319    bool "Enable mapping support"
    282320    default n
    283     depends on CONFIG_IFUPDOWN
     321    depends on IFUPDOWN
    284322    help
    285323      This enables support for the "mapping" stanza, unless you have
    286324      a weird network setup you don't need it.
    287325
    288 config CONFIG_INETD
     326config FEATURE_IFUPDOWN_EXTERNAL_DHCP
     327    bool "Enable support for external dhcp clients"
     328    default n
     329    depends on IFUPDOWN
     330    help
     331      This enables support for the external dhcp clients. Clients are
     332      tried in the following order: dhcpcd, dhclient, pump and udhcpc.
     333      Otherwise, if udhcpc applet is enabled, it is used.
     334      Otherwise, ifup/ifdown will have no support for DHCP.
     335
     336config INETD
    289337    bool "inetd"
    290338    default n
     339    select FEATURE_SYSLOG
    291340    help
    292341      Internet superserver daemon
    293342
    294 config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
     343config FEATURE_INETD_SUPPORT_BUILTIN_ECHO
    295344    bool "Support echo service"
    296345    default y
    297     depends on CONFIG_INETD
     346    depends on INETD
    298347    help
    299348      Echo received data internal inetd service
    300349
    301 config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
     350config FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
    302351    bool "Support discard service"
    303352    default y
    304     depends on CONFIG_INETD
     353    depends on INETD
    305354    help
    306355      Internet /dev/null internal inetd service
    307356
    308 config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME
     357config FEATURE_INETD_SUPPORT_BUILTIN_TIME
    309358    bool "Support time service"
    310359    default y
    311     depends on CONFIG_INETD
     360    depends on INETD
    312361    help
    313362      Return 32 bit time since 1900 internal inetd service
    314363
    315 config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
     364config FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
    316365    bool "Support daytime service"
    317366    default y
    318     depends on CONFIG_INETD
     367    depends on INETD
    319368    help
    320369      Return human-readable time internal inetd service
    321370
    322 config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
     371config FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
    323372    bool "Support chargen service"
    324373    default y
    325     depends on CONFIG_INETD
     374    depends on INETD
    326375    help
    327376      Familiar character generator internal inetd service
    328377
    329 config CONFIG_FEATURE_INETD_RPC
     378config FEATURE_INETD_RPC
    330379    bool "Support RPC services"
    331380    default n
    332     depends on CONFIG_INETD
    333     help
    334       Suuport Sun-RPC based services
    335 
    336 
    337 config CONFIG_IP
     381    depends on INETD
     382    select FEATURE_HAVE_RPC
     383    help
     384      Support Sun-RPC based services
     385
     386config IP
    338387    bool "ip"
    339388    default n
    … …  
    343392      TCP/IP.
    344393
    345 config CONFIG_FEATURE_IP_ADDRESS
     394config FEATURE_IP_ADDRESS
    346395    bool "ip address"
    347396    default y
    348     depends on CONFIG_IP
     397    depends on IP
    349398    help
    350399      Address manipulation support for the "ip" applet.
    351400
    352 config CONFIG_FEATURE_IP_LINK
     401config FEATURE_IP_LINK
    353402    bool "ip link"
    354403    default y
    355     depends on CONFIG_IP
     404    depends on IP
    356405    help
    357406      Configure network devices with "ip".
    358407
    359 config CONFIG_FEATURE_IP_ROUTE
     408config FEATURE_IP_ROUTE
    360409    bool "ip route"
    361410    default y
    362     depends on CONFIG_IP
     411    depends on IP
    363412    help
    364413      Add support for routing table management to "ip".
    365414
    366 config CONFIG_FEATURE_IP_TUNNEL
     415config FEATURE_IP_TUNNEL
    367416    bool "ip tunnel"
    368417    default n
    369     depends on CONFIG_IP
     418    depends on IP
    370419    help
    371420      Add support for tunneling commands to "ip".
    372421
    373 config CONFIG_FEATURE_IP_SHORT_FORMS
     422config FEATURE_IP_RULE
     423    bool "ip rule"
     424    default n
     425    depends on IP
     426    help
     427      Add support for rule commands to "ip".
     428
     429config FEATURE_IP_SHORT_FORMS
    374430    bool "Support short forms of ip commands."
    375431    default n
    376     depends on CONFIG_IP
     432    depends on IP
    377433    help
    378434      Also support short-form of ip <OBJECT> commands:
    … …  
    381437      ip route  -> iproute
    382438      ip tunnel -> iptunnel
     439      ip rule   -> iprule
    383440
    384441      Say N unless you desparately need the short form of the ip
    385442      object commands.
    386443
    387 config CONFIG_IPADDR
     444config IPADDR
    388445    bool
    389446    default y
    390     depends on CONFIG_FEATURE_IP_SHORT_FORMS && CONFIG_FEATURE_IP_ADDRESS
    391 
    392 config CONFIG_IPLINK
     447    depends on FEATURE_IP_SHORT_FORMS && FEATURE_IP_ADDRESS
     448
     449config IPLINK
    393450    bool
    394451    default y
    395     depends on CONFIG_FEATURE_IP_SHORT_FORMS && CONFIG_FEATURE_IP_LINK
    396 
    397 config CONFIG_IPROUTE
     452    depends on FEATURE_IP_SHORT_FORMS && FEATURE_IP_LINK
     453
     454config IPROUTE
    398455    bool
    399456    default y
    400     depends on CONFIG_FEATURE_IP_SHORT_FORMS && CONFIG_FEATURE_IP_ROUTE
    401 
    402 config CONFIG_IPTUNNEL
     457    depends on FEATURE_IP_SHORT_FORMS && FEATURE_IP_ROUTE
     458
     459config IPTUNNEL
    403460    bool
    404461    default y
    405     depends on CONFIG_FEATURE_IP_SHORT_FORMS && CONFIG_FEATURE_IP_TUNNEL
    406 
    407 config CONFIG_IPCALC
     462    depends on FEATURE_IP_SHORT_FORMS && FEATURE_IP_TUNNEL
     463
     464config IPRULE
     465    bool
     466    default y
     467    depends on FEATURE_IP_SHORT_FORMS && FEATURE_IP_RULE
     468
     469config IPCALC
    408470    bool "ipcalc"
    409471    default n
    … …  
    412474      resulting broadcast, network, and host range.
    413475
    414 config CONFIG_FEATURE_IPCALC_FANCY
     476config FEATURE_IPCALC_FANCY
    415477    bool "Fancy IPCALC, more options, adds 1 kbyte"
    416478    default y
    417     depends on CONFIG_IPCALC
     479    depends on IPCALC
    418480    help
    419481      Adds the options hostname, prefix and silent to the output of "ipcalc".
    420482
    421 config CONFIG_FEATURE_IPCALC_LONG_OPTIONS
     483config FEATURE_IPCALC_LONG_OPTIONS
    422484    bool "Enable long options"
    423485    default n
    424     depends on CONFIG_IPCALC && CONFIG_GETOPT_LONG
     486    depends on IPCALC && GETOPT_LONG
    425487    help
    426488      Support long options for the ipcalc applet.
    427489
    428 config CONFIG_NAMEIF
     490config NAMEIF
    429491    bool "nameif"
    430492    default n
     493    select FEATURE_SYSLOG
    431494    help
    432495      nameif is used to rename network interface by its MAC address.
    … …  
    440503      new_interface_name    XX:XX:XX:XX:XX:XX
    441504
    442 config CONFIG_NC
     505config NC
    443506    bool "nc"
    444507    default n
    … …  
    447510      connections.
    448511
    449 config CONFIG_NC_GAPING_SECURITY_HOLE
    450     bool "gaping security hole"
    451     default n
    452     depends on CONFIG_NC
    453     help
    454       Add support for executing a program after making or receiving a
    455       successful connection (-e option).
    456 
    457 config CONFIG_NETSTAT
     512config NC_SERVER
     513    bool "Netcat server options (-l)"
     514    default n
     515    depends on NC
     516    help
     517      Allow netcat to act as a server.
     518
     519config NC_EXTRA
     520    bool "Netcat extensions (-eiw and filename)"
     521    default n
     522    depends on NC
     523    help
     524      Add -e (support for executing the rest of the command line after
     525      making or receiving a successful connection), -i (delay interval for
     526      lines sent), -w (timeout for initial connection).
     527
     528config NETSTAT
    458529    bool "netstat"
    459530    default n
    … …  
    461532      netstat prints information about the Linux networking subsystem.
    462533
    463 config CONFIG_NSLOOKUP
     534config FEATURE_NETSTAT_WIDE
     535    bool "  Enable wide netstat output"
     536    default n
     537    depends on NETSTAT
     538    help
     539      Add support for wide columns. Useful when displaying IPv6 addresses
     540      (-W option).
     541
     542config NSLOOKUP
    464543    bool "nslookup"
    465544    default n
    … …  
    467546      nslookup is a tool to query Internet name servers.
    468547
    469 config CONFIG_PING
     548config PING
    470549    bool "ping"
    471550    default n
    … …  
    474553      elicit an ICMP ECHO_RESPONSE from a host or gateway.
    475554
    476 config CONFIG_FEATURE_FANCY_PING
     555config PING6
     556    bool "ping6"
     557    default n
     558    depends on FEATURE_IPV6 && PING
     559    help
     560      This will give you a ping that can talk IPv6.
     561
     562config PSCAN
     563    bool "pscan"
     564    default n
     565    help
     566      Simple network port scanner.
     567
     568config FEATURE_FANCY_PING
    477569    bool "Enable fancy ping output"
    478570    default y
    479     depends on CONFIG_PING
     571    depends on PING
    480572    help
    481573      Make the output from the ping applet include statistics, and at the
    482574      same time provide full support for ICMP packets.
    483575
    484 config CONFIG_PING6
    485     bool "ping6"
    486     default n
    487     depends on CONFIG_FEATURE_IPV6
    488     help
    489       This will give you a ping that can talk IPv6.
    490 
    491 config CONFIG_FEATURE_FANCY_PING6
    492     bool "Enable fancy ping6 output"
    493     default y
    494     depends on CONFIG_PING6
    495     help
    496       Make the output from the ping6 applet include statistics, and at the
    497       same time provide full support for ICMP packets.
    498 
    499 config CONFIG_ROUTE
     576config ROUTE
    500577    bool "route"
    501578    default n
    … …  
    503580      Route displays or manipulates the kernel's IP routing tables.
    504581
    505 config CONFIG_TELNET
     582config SLATTACH
     583    bool "slattach"
     584    default n
     585    help
     586      slattach is a small utility to attach network interfaces to serial lines.
     587
     588config TELNET
    506589    bool "telnet"
    507590    default n
    … …  
    510593      used to test other simple protocols.
    511594
    512 config CONFIG_FEATURE_TELNET_TTYPE
     595config FEATURE_TELNET_TTYPE
    513596    bool "Pass TERM type to remote host"
    514597    default y
    515     depends on CONFIG_TELNET
     598    depends on TELNET
    516599    help
    517600      Setting this option will forward the TERM environment variable to the
    … …  
    519602      things like ANSI colors and other control sequences behave.
    520603
    521 config CONFIG_FEATURE_TELNET_AUTOLOGIN
     604config FEATURE_TELNET_AUTOLOGIN
    522605    bool "Pass USER type to remote host"
    523606    default y
    524     depends on CONFIG_TELNET
     607    depends on TELNET
    525608    help
    526609      Setting this option will forward the USER environment variable to the
    … …  
    529612      option enables `-a' and `-l USER' arguments.
    530613
    531 config CONFIG_TELNETD
     614config TELNETD
    532615    bool "telnetd"
    533616    default n
     617    select FEATURE_SYSLOG
    534618    help
    535619      A daemon for the TELNET protocol, allowing you to log onto the host
    … …  
    543627      Note that for busybox telnetd to work you need several things:
    544628      First of all, your kernel needs:
    545           CONFIG_UNIX98_PTYS=y
    546           CONFIG_DEVPTS_FS=y
     629          UNIX98_PTYS=y
     630          DEVPTS_FS=y
    547631
    548632      Next, you need a /dev/pts directory on your root filesystem:
    … …  
    561645          mount -t devpts devpts /dev/pts
    562646
    563       You need to be sure that Busybox has CONFIG_LOGIN and
    564       CONFIG_FEATURE_SUID enabled.  And finally, you should make
     647      You need to be sure that Busybox has LOGIN and
     648      FEATURE_SUID enabled.  And finally, you should make
    565649      certain that Busybox has been installed setuid root:
    566650
    … …  
    571655
    572656
    573 config CONFIG_FEATURE_TELNETD_INETD
    574     bool "Support call from inetd only"
    575     default n
    576     depends on CONFIG_TELNETD
    577     help
    578       Selecting this will make telnetd only callable from inetd,
    579       removing the standalone support.
    580 
    581 config CONFIG_TFTP
     657config FEATURE_TELNETD_STANDALONE
     658    bool "Support standalone telnetd (not inetd only)"
     659    default n
     660    depends on TELNETD
     661    help
     662      Selecting this will make telnetd able to run standalone.
     663
     664config TFTP
    582665    bool "tftp"
    583666    default n
    … …  
    587670      for a network-enabled bootloader.
    588671
    589 config CONFIG_FEATURE_TFTP_GET
     672config FEATURE_TFTP_GET
    590673    bool "Enable \"get\" command"
    591674    default y
    592     depends on CONFIG_TFTP
     675    depends on TFTP
    593676    help
    594677      Add support for the GET command within the TFTP client.  This allows
    595678      a client to retrieve a file from a TFTP server.
    596679
    597 config CONFIG_FEATURE_TFTP_PUT
     680config FEATURE_TFTP_PUT
    598681    bool "Enable \"put\" command"
    599682    default y
    600     depends on CONFIG_TFTP
     683    depends on TFTP
    601684    help
    602685      Add support for the PUT command within the TFTP client.  This allows
    603686      a client to transfer a file to a TFTP server.
    604687
    605 config CONFIG_FEATURE_TFTP_BLOCKSIZE
     688config FEATURE_TFTP_BLOCKSIZE
    606689    bool "Enable \"blocksize\" command"
    607690    default n
    608     depends on CONFIG_TFTP
     691    depends on TFTP
    609692    help
    610693      Allow the client to specify the desired block size for transfers.
    611694
    612 config CONFIG_DEBUG_TFTP
     695config DEBUG_TFTP
    613696    bool "Enable debug"
    614697    default n
    615     depends on CONFIG_TFTP
     698    depends on TFTP
    616699    help
    617700      Enable debug settings for tftp.  This is useful if you're running
    … …  
    619702      you run into problems.
    620703
    621 config CONFIG_TRACEROUTE
     704config TRACEROUTE
    622705    bool "traceroute"
    623706    default n
    … …  
    625708      Utility to trace the route of IP packets
    626709
    627 config CONFIG_FEATURE_TRACEROUTE_VERBOSE
     710config FEATURE_TRACEROUTE_VERBOSE
    628711    bool "Enable verbose output"
    629712    default n
    630     depends on CONFIG_TRACEROUTE
     713    depends on TRACEROUTE
    631714    help
    632715      Add some verbosity to traceroute.  This includes amongst other things
    633716      hostnames and ICMP response types.
    634717
    635 config CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
     718config FEATURE_TRACEROUTE_SOURCE_ROUTE
    636719    bool "Enable loose source route"
    637720    default n
    638     depends on CONFIG_TRACEROUTE
     721    depends on TRACEROUTE
    639722    help
    640723      Add option to specify a loose source route gateway
    641724      (8 maximum).
    642725
    643 config CONFIG_FEATURE_TRACEROUTE_USE_ICMP
     726config FEATURE_TRACEROUTE_USE_ICMP
    644727    bool "Use ICMP instead of UDP"
    645728    default n
    646     depends on CONFIG_TRACEROUTE
     729    depends on TRACEROUTE
    647730    help
    648731      Add feature to allow for ICMP ECHO instead of UDP datagrams.
    … …  
    650733source networking/udhcp/Config.in
    651734
    652 config CONFIG_VCONFIG
     735config VCONFIG
    653736    bool "vconfig"
    654737    default n
    … …  
    656739      Creates, removes, and configures VLAN interfaces
    657740
    658 config CONFIG_WGET
     741config WGET
    659742    bool "wget"
    660743    default n
    … …  
    663746      HTTPS, and FTP servers.
    664747
    665 config CONFIG_FEATURE_WGET_STATUSBAR
     748config FEATURE_WGET_STATUSBAR
    666749    bool "Enable a nifty process meter (+2k)"
    667750    default y
    668     depends on CONFIG_WGET
     751    depends on WGET
    669752    help
    670753      Enable the transfer progress bar for wget transfers.
    671754
    672 config CONFIG_FEATURE_WGET_AUTHENTICATION
     755config FEATURE_WGET_AUTHENTICATION
    673756    bool "Enable HTTP authentication"
    674757    default y
    675     depends on CONFIG_WGET
     758    depends on WGET
    676759    help
    677760      Support authenticated HTTP transfers.
    678761
    679 config CONFIG_FEATURE_WGET_IP6_LITERAL
    680     bool "Enable IPv6 literal addresses"
    681     default y
    682     depends on CONFIG_WGET && CONFIG_FEATURE_IPV6
    683     help
    684       Support IPv6 address literal notation in URLs.
    685 
    686 config CONFIG_FEATURE_WGET_LONG_OPTIONS
     762config FEATURE_WGET_LONG_OPTIONS
    687763    bool "Enable long options"
    688764    default n
    689     depends on CONFIG_WGET && CONFIG_GETOPT_LONG
     765    depends on WGET && GETOPT_LONG
    690766    help
    691767      Support long options for the wget applet.
    692768
    693 config CONFIG_ZCIP
     769config ZCIP
    694770    bool "zcip"
    695771    default n
     772    select FEATURE_SYSLOG
    696773    help
    697774      ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
Note: See TracChangeset for help on using the changeset viewer.