summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDenys Vlasenko2010-03-19 23:42:23 +0100
committerDenys Vlasenko2010-03-19 23:42:23 +0100
commit777706cb2352c02602842f89d916a0e18ce6bd91 (patch)
tree75596b337731c87718c9015eb9eb6730183824dd /examples
parent77a2c51e79eb54c8f5cc8903465223cbac6e8d50 (diff)
downloadbusybox-777706cb2352c02602842f89d916a0e18ce6bd91.zip
busybox-777706cb2352c02602842f89d916a0e18ce6bd91.tar.gz
udhcp: remove support for some really old and odd options
function old new delta dhcp_options 72 68 -4 dhcp_option_strings 271 253 -18 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/udhcp/udhcpd.conf16
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/udhcp/udhcpd.conf b/examples/udhcp/udhcpd.conf
index 6550cab..1e05435 100644
--- a/examples/udhcp/udhcpd.conf
+++ b/examples/udhcp/udhcpd.conf
@@ -8,8 +8,8 @@ end 192.168.0.254
# The interface that udhcpd will use
interface eth0
-# The maximim number of leases (includes addresses reserved
-# by OFFER's, DECLINE's, and ARP conficts). Will be corrected
+# The maximum number of leases (includes addresses reserved
+# by OFFER's, DECLINE's, and ARP conflicts). Will be corrected
# if it's bigger than IP lease block, but it ok to make it
# smaller than lease block.
#max_leases 254
@@ -24,7 +24,7 @@ interface eth0
#decline_time 3600
# The amount of time that an IP will be reserved
-# if an ARP conflct occurs (seconds).
+# if an ARP conflict occurs (seconds).
#conflict_time 3600
# How long an offered address is reserved (seconds).
@@ -40,7 +40,7 @@ interface eth0
# The location of the pid file
#pidfile /var/run/udhcpd.pid
-# Everytime 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
@@ -49,7 +49,7 @@ interface eth0
#sname zorak #default: none
#boot_file /var/nfs_root #default: none
-# The remainer of options are DHCP options and can be specifed with the
+# 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
# lines. The only option with a default is 'lease'.
@@ -58,7 +58,7 @@ opt dns 192.168.10.2 192.168.10.10
option subnet 255.255.255.0
opt router 192.168.10.2
opt wins 192.168.10.10
-option dns 129.219.13.81 # appened to above DNS servers for a total of 3
+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
@@ -67,10 +67,10 @@ option lease 864000 # 10 days of seconds
#opt timezone
#opt router
#opt timesrv
-#opt namesrv
+#opt namesrv - obsolete, disabled
#opt dns
#opt logsrv
-#opt cookiesrv
+#opt cookiesrv - rarely (never?) used, disabled
#opt lprsrv
#opt bootsize
#opt domain