aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-12-01 21:34:45 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-12-01 21:34:45 +0000
commit54e798d85bdd782af727eb297a93c7046b1ed811 (patch)
treea3cff053fed840185cdd7dd8695c95d1fe0da8aa /package
parentadc39266bfbb32959a0d732d8b6a5ccfca775c92 (diff)
downloadupstream-54e798d85bdd782af727eb297a93c7046b1ed811.tar.gz
upstream-54e798d85bdd782af727eb297a93c7046b1ed811.tar.bz2
upstream-54e798d85bdd782af727eb297a93c7046b1ed811.zip
[package] dnsmasq: automatically add host entry for own hostname and ptr record for lan ip address
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29375 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dnsmasq/files/dnsmasq.init16
2 files changed, 14 insertions, 4 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 1f99b5014b..a2084a616c 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
PKG_VERSION:=2.59
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 80ab250baa..b0c2cd226f 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -326,10 +326,10 @@ dhcp_domain_add() {
local cfg="$1"
local ip name names
- config_get names "$cfg" name
+ config_get names "$cfg" name "$2"
[ -n "$names" ] || return 0
- config_get ip "$cfg" ip
+ config_get ip "$cfg" ip "$3"
[ -n "$ip" ] || return 0
local oIFS="$IFS"; IFS="."; set -- $ip; IFS="$oIFS"
@@ -342,7 +342,7 @@ dhcp_domain_add() {
fqdn="$fqdn${DOMAIN:+.$DOMAIN}"
append args "-A /$fqdn/$ip"
-
+
[ -n "$raddr" ] && {
append args "--ptr-record=$raddr,$fqdn"
raddr=""
@@ -383,6 +383,10 @@ dhcp_cname_add() {
start() {
include /lib/network
scan_interfaces
+
+ local lanaddr
+ config_get lanaddr "lan" ipaddr
+
config_load dhcp
args=""
@@ -400,6 +404,12 @@ start() {
config_foreach dhcp_add dhcp
config_foreach dhcp_cname_add cname
+ # add own hostname
+ [ -z "$lanaddr" ] || {
+ local hostname="$(uci_get system.@system[0].hostname)"
+ dhcp_domain_add "" "${hostname:-OpenWrt}" "$lanaddr"
+ }
+
service_start /usr/sbin/dnsmasq $args && {
rm -f /tmp/resolv.conf
[ -n "$DOMAIN" ] && echo "search $DOMAIN" >> /tmp/resolv.conf