Commit 3d04f463 authored by Simon Kelley's avatar Simon Kelley

inotify documentation updates.

parent aff33962
...@@ -50,6 +50,10 @@ Additional hosts file. Read the specified file as well as /etc/hosts. If -h is g ...@@ -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 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. additional hosts file. If a directory is given, then read all the files contained in that directory.
.TP .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 .B \-E, --expand-hosts
Add the domain to simple names (without a period) in /etc/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 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 ...@@ -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 it is possible to encode the information in a
.TP .TP
.B --dhcp-hostsdir=<path> .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 directory, and not an individual file. Changed or new files within
the directory are read automatically, without the need to send SIGHUP. 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 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 host record it contained will remain until dnsmasq recieves a SIGHUP, or
is restarted; ie host records are only added dynamically. 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 .TP
.B --dhcp-boot .B --dhcp-boot
flag as DHCP options, using the options names bootfile-name, flag as DHCP options, using the options names bootfile-name,
...@@ -1791,7 +1797,8 @@ clears its cache and then re-loads ...@@ -1791,7 +1797,8 @@ clears its cache and then re-loads
.I /etc/hosts .I /etc/hosts
and and
.I /etc/ethers .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 The dhcp lease change script is called for all
existing DHCP leases. If existing DHCP leases. If
.B .B
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment