summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Kelley <simon@thekelleys.org.uk>2015-01-31 21:59:13 +0000
committerSimon Kelley <simon@thekelleys.org.uk>2015-01-31 21:59:13 +0000
commit3d04f46334d0e345f589eda1372e638b946fe637 (patch)
treeee5426dd9680465aa243875316e43d9c9ed3a214
parentaff3396280e944833f0e23d834aa6acd5fe2605a (diff)
downloaddnsmasq-3d04f46334d0e345f589eda1372e638b946fe637.tar.gz
inotify documentation updates.
-rw-r--r--man/dnsmasq.811
1 files changed, 9 insertions, 2 deletions
diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
index 005b5cc..c858323 100644
--- a/man/dnsmasq.8
+++ b/man/dnsmasq.8
@@ -50,6 +50,10 @@ Additional hosts file. Read the specified file as well as /etc/hosts. If -h is g
only the specified file. This option may be repeated for more than one
additional hosts file. If a directory is given, then read all the files contained in that directory.
.TP
+.B --hostsdir=<path>
+Read all the hosts files contained in the directory. New or changed files
+are read automatically. See --dhcp-hostsdir for details.
+.TP
.B \-E, --expand-hosts
Add the domain to simple names (without a period) in /etc/hosts
in the same way as for DHCP-derived names. Note that this does not
@@ -979,12 +983,14 @@ dhcp-optsfile will be re-read when dnsmasq receives SIGHUP. Note that
it is possible to encode the information in a
.TP
.B --dhcp-hostsdir=<path>
-This is exactly equivalent to dhcp-hostfile, except for the following. The path MUST be a
+This is equivalent to dhcp-hostsfile, except for the following. The path MUST be a
directory, and not an individual file. Changed or new files within
the directory are read automatically, without the need to send SIGHUP.
If a file is deleted for changed after it has been read by dnsmasq, then the
host record it contained will remain until dnsmasq recieves a SIGHUP, or
is restarted; ie host records are only added dynamically.
+.B --dhcp-optsdir=<path>
+This is equivalent to dhcp-optsfile, with the differences noted for --dhcp-hostsdir.
.TP
.B --dhcp-boot
flag as DHCP options, using the options names bootfile-name,
@@ -1791,7 +1797,8 @@ clears its cache and then re-loads
.I /etc/hosts
and
.I /etc/ethers
-and any file given by --dhcp-hostsfile, --dhcp-optsfile or --addn-hosts.
+and any file given by --dhcp-hostsfile, --dhcp-hostsdir, --dhcp-optsfile,
+--dhcp-optsdir, --addn-hosts or --hostsdir.
The dhcp lease change script is called for all
existing DHCP leases. If
.B