aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2014-05-20 05:00:28 +0000
committerFlorian Fainelli <florian@openwrt.org>2014-05-20 05:00:28 +0000
commit8f526ff53067d029f42e0b887d770b28546fc0e9 (patch)
tree21da62fc3caa4820ff83cf1d22cee02a297fba72
parent0571a1454b4a9b7c95dc429118534dac32c603e4 (diff)
downloadupstream-8f526ff53067d029f42e0b887d770b28546fc0e9.tar.gz
upstream-8f526ff53067d029f42e0b887d770b28546fc0e9.tar.bz2
upstream-8f526ff53067d029f42e0b887d770b28546fc0e9.zip
dnsmasq: Allow creating static DNS entries from static lease entries
DHCP entries in /etc/config/dhcp will not automatically create A or PTR records. Add an "option dns" directive which appends an entry to /tmp/hosts/dhcp to facilitate forward and reverse DNS lookups. For instance, this item: config host option ip '192.168.0.10' option mac '00:13:57:9b:df:02' option name 'winpc' option dns '1' will add a corresponding entry to /tmp/hosts/dhcp: 192.168.0.10 winpc.lan This keeps the hostname/IP/MAC in a single place, for easy maintenance. Related: ticket #13854 reports an regression involving missing PTR records when using "config domain" to define static DNS entries for individual hosts. However, per Simon Kelley[1], the --address feature used by "config domain" was never intended to generate DNS A records for hosts. It would probably be better for the reporter to apply this patch, and then use "config host" sections instead of "config domain" sections. [1] http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2008q4/002498.html Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 40799
-rw-r--r--package/network/services/dnsmasq/files/dnsmasq.init7
1 files changed, 7 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index b5fb58c524..f7edb28806 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -13,6 +13,7 @@ ADD_LOCAL_DOMAIN=1
ADD_LOCAL_HOSTNAME=1
CONFIGFILE="/var/etc/dnsmasq.conf"
+HOSTFILE="/tmp/hosts/dhcp"
xappend() {
local value="$1"
@@ -300,6 +301,11 @@ dhcp_host_add() {
[ "$broadcast" = "0" ] && broadcast=
xappend "--dhcp-host=$macs${networkid:+,net:$networkid}${broadcast:+,set:needs-broadcast}${tag:+,set:$tag}${ip:+,$ip}${name:+,$name}"
+
+ config_get_bool dns "$cfg" dns 0
+ [ "$dns" = "1" ] && {
+ echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE
+ }
}
dhcp_tag_add() {
@@ -528,6 +534,7 @@ start_service() {
mkdir -p $(dirname $CONFIGFILE)
echo "# auto-generated config file from /etc/config/dhcp" > $CONFIGFILE
+ echo "# auto-generated config file from /etc/config/dhcp" > $HOSTFILE
# if we did this last, we could override auto-generated config
[ -f /etc/dnsmasq.conf ] && {