udhcpc: make it possible to disable vendor id; improve help text

function                                             old     new   delta
init_packet                                          135     139      +4
packed_usage                                       26789   26786      -3
alloc_dhcp_option                                     67      63      -4
udhcpc_main                                         2467    2447     -20
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/3 up/down: 4/-27)             Total: -23 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-03-20 18:06:23 +01:00
parent 0f62c4d065
commit 87fa216e1e
6 changed files with 88 additions and 82 deletions

View File

@@ -20,18 +20,18 @@ interface eth0
#auto_time 7200
# The amount of time that an IP will be reserved (leased to nobody)
# if a DHCP decline message is received (seconds).
# if a DHCP decline message is received (seconds)
#decline_time 3600
# The amount of time that an IP will be reserved
# if an ARP conflict occurs (seconds).
# if an ARP conflict occurs (seconds)
#conflict_time 3600
# How long an offered address is reserved (seconds).
# How long an offered address is reserved (seconds)
#offer_time 60
# If client asks for lease below this value, it will be rounded up
# to this value (seconds).
# to this value (seconds)
#min_lease 60
# The location of the leases file
@@ -40,15 +40,19 @@ interface eth0
# The location of the pid file
#pidfile /var/run/udhcpd.pid
# Every time udhcpd writes a leases file, the below script will be called.
# Every time udhcpd writes a leases file, the below script will be called
#notify_file # default: no script
#notify_file dumpleases # useful for debugging
# The following are bootp specific options, settable by udhcpd.
# The following are bootp specific options
#siaddr 192.168.0.22 #default: 0.0.0.0
#sname zorak #default: none
#boot_file /var/nfs_root #default: none
# Static leases map
#static_lease 00:60:08:11:CE:4E 192.168.0.54
#static_lease 00:60:08:11:CE:3E 192.168.0.44
# The remainder of options are DHCP options and can be specified with the
# keyword 'opt' or 'option'. If an option can take multiple items, such
# as the dns option, they can be listed on the same line, or multiple
@@ -60,7 +64,7 @@ opt router 192.168.10.2
opt wins 192.168.10.10
option dns 129.219.13.81 # appended to above DNS servers for a total of 3
option domain local
option lease 864000 # 10 days of seconds
option lease 864000 # 10 days
# Currently supported options (for more info, see options.c):
#opt lease NUM
@@ -92,7 +96,3 @@ option lease 864000 # 10 days of seconds
#opt swapsrv IP
#opt timesrv IP_LIST
#opt ntpsrv IP_LIST
# Static leases map
#static_lease 00:60:08:11:CE:4E 192.168.0.54
#static_lease 00:60:08:11:CE:3E 192.168.0.44