--- trunk/mkinitrd-magellan/busybox/examples/udhcp/udhcpd.conf	2010/04/29 20:38:48	983
+++ trunk/mkinitrd-magellan/busybox/examples/udhcp/udhcpd.conf	2010/05/30 11:32:42	984
@@ -1,88 +1,59 @@
 # Sample udhcpd configuration file (/etc/udhcpd.conf)
+# Values shown are defaults
 
 # The start and end of the IP lease block
-
-start		192.168.0.20	#default: 192.168.0.20
-end		192.168.0.254	#default: 192.168.0.254
-
+start		192.168.0.20
+end		192.168.0.254
 
 # The interface that udhcpd will use
+interface	eth0
 
-interface	eth0		#default: eth0
-
-
-# The maximim number of leases (includes addressesd reserved
-# by OFFER's, DECLINE's, and ARP conficts
-
-#max_leases	254		#default: 254
-
-
-# If remaining is true (default), udhcpd will store the time
-# remaining for each lease in the udhcpd leases file. This is
-# for embedded systems that cannot keep time between reboots.
-# If you set remaining to no, the absolute time that the lease
-# expires at will be stored in the dhcpd.leases file.
-
-#remaining	yes		#default: yes
-
+# The maximim number of leases (includes addresses reserved
+# by OFFER's, DECLINE's, and ARP conficts). Will be corrected
+# if it's bigger than IP lease block, but it ok to make it
+# smaller than lease block.
+#max_leases	254
 
 # The time period at which udhcpd will write out a dhcpd.leases
 # file. If this is 0, udhcpd will never automatically write a
-# lease file. (specified in seconds)
-
-#auto_time	7200		#default: 7200 (2 hours)
-
-
-# The amount of time that an IP will be reserved (leased) for if a
-# DHCP decline message is received (seconds).
-
-#decline_time	3600		#default: 3600 (1 hour)
-
-
-# The amount of time that an IP will be reserved (leased) for if an
-# ARP conflct occurs. (seconds
-
-#conflict_time	3600		#default: 3600 (1 hour)
-
-
-# How long an offered address is reserved (leased) in seconds
-
-#offer_time	60		#default: 60 (1 minute)
-
-# If a lease to be given is below this value, the full lease time is
-# instead used (seconds).
-
-#min_lease	60		#defult: 60
+# lease file. Specified in seconds.
+#auto_time	7200
 
+# The amount of time that an IP will be reserved (leased to nobody)
+# if a DHCP decline message is received (seconds).
+#decline_time	3600
+
+# The amount of time that an IP will be reserved
+# if an ARP conflct occurs (seconds).
+#conflict_time	3600
+
+# 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).
+#min_lease	60
 
 # The location of the leases file
-
-#lease_file	/var/lib/misc/udhcpd.leases	#defualt: /var/lib/misc/udhcpd.leases
+#lease_file	/var/lib/misc/udhcpd.leases
 
 # The location of the pid file
-#pidfile	/var/run/udhcpd.pid	#default: /var/run/udhcpd.pid
+#pidfile	/var/run/udhcpd.pid
 
 # Everytime udhcpd writes a leases file, the below script will be called.
-# Useful for writing the lease file to flash every few hours.
-
-#notify_file				#default: (no script)
-
-#notify_file	dumpleases	# <--- useful for debugging
-
-# The following are bootp specific options, setable by udhcpd.
+#notify_file			# default: no script
+#notify_file	dumpleases	# useful for debugging
 
+# The following are bootp specific options, settable by udhcpd.
 #siaddr		192.168.0.22		#default: 0.0.0.0
-
-#sname		zorak			#default: (none)
-
-#boot_file	/var/nfs_root		#default: (none)
+#sname		zorak			#default: none
+#boot_file	/var/nfs_root		#default: none
 
 # The remainer of options are DHCP options and can be specifed 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'.
-
-#Examles
+# Examples:
 opt	dns	192.168.10.2 192.168.10.10
 option	subnet	255.255.255.0
 opt	router	192.168.10.2
@@ -91,8 +62,7 @@
 option	domain	local
 option	lease	864000		# 10 days of seconds
 
-
-# Currently supported options, for more info, see options.c
+# Currently supported options (for more info, see options.c):
 #opt subnet
 #opt timezone
 #opt router
@@ -115,9 +85,6 @@
 #opt tftp
 #opt bootfile
 
-
 # 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
-
-