]>
Commit | Line | Data |
---|---|---|
6644c1c7 MT |
1 | From 3d04f46334d0e345f589eda1372e638b946fe637 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Kelley <simon@thekelleys.org.uk> | |
3 | Date: Sat, 31 Jan 2015 21:59:13 +0000 | |
697b4f04 | 4 | Subject: [PATCH 040/113] inotify documentation updates. |
6644c1c7 MT |
5 | |
6 | --- | |
7 | man/dnsmasq.8 | 11 +++++++++-- | |
8 | 1 file changed, 9 insertions(+), 2 deletions(-) | |
9 | ||
10 | diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 | |
11 | index 005b5cca8d1f..c858323d78bd 100644 | |
12 | --- a/man/dnsmasq.8 | |
13 | +++ b/man/dnsmasq.8 | |
14 | @@ -50,6 +50,10 @@ Additional hosts file. Read the specified file as well as /etc/hosts. If -h is g | |
15 | only the specified file. This option may be repeated for more than one | |
16 | additional hosts file. If a directory is given, then read all the files contained in that directory. | |
17 | .TP | |
18 | +.B --hostsdir=<path> | |
19 | +Read all the hosts files contained in the directory. New or changed files | |
20 | +are read automatically. See --dhcp-hostsdir for details. | |
21 | +.TP | |
22 | .B \-E, --expand-hosts | |
23 | Add the domain to simple names (without a period) in /etc/hosts | |
24 | in the same way as for DHCP-derived names. Note that this does not | |
25 | @@ -979,12 +983,14 @@ dhcp-optsfile will be re-read when dnsmasq receives SIGHUP. Note that | |
26 | it is possible to encode the information in a | |
27 | .TP | |
28 | .B --dhcp-hostsdir=<path> | |
29 | -This is exactly equivalent to dhcp-hostfile, except for the following. The path MUST be a | |
30 | +This is equivalent to dhcp-hostsfile, except for the following. The path MUST be a | |
31 | directory, and not an individual file. Changed or new files within | |
32 | the directory are read automatically, without the need to send SIGHUP. | |
33 | If a file is deleted for changed after it has been read by dnsmasq, then the | |
34 | host record it contained will remain until dnsmasq recieves a SIGHUP, or | |
35 | is restarted; ie host records are only added dynamically. | |
36 | +.B --dhcp-optsdir=<path> | |
37 | +This is equivalent to dhcp-optsfile, with the differences noted for --dhcp-hostsdir. | |
38 | .TP | |
39 | .B --dhcp-boot | |
40 | flag as DHCP options, using the options names bootfile-name, | |
41 | @@ -1791,7 +1797,8 @@ clears its cache and then re-loads | |
42 | .I /etc/hosts | |
43 | and | |
44 | .I /etc/ethers | |
45 | -and any file given by --dhcp-hostsfile, --dhcp-optsfile or --addn-hosts. | |
46 | +and any file given by --dhcp-hostsfile, --dhcp-hostsdir, --dhcp-optsfile, | |
47 | +--dhcp-optsdir, --addn-hosts or --hostsdir. | |
48 | The dhcp lease change script is called for all | |
49 | existing DHCP leases. If | |
50 | .B | |
51 | -- | |
52 | 2.1.0 | |
53 |