[package] dnsmasq: automatically add host entry for own hostname and ptr record for...
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 1 Dec 2011 21:34:45 +0000 (21:34 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 1 Dec 2011 21:34:45 +0000 (21:34 +0000)
SVN-Revision: 29375

package/dnsmasq/Makefile
package/dnsmasq/files/dnsmasq.init

index 1f99b5014b3d3fd3a5f644fbaf2b8eddfaf8af97..a2084a616cdd79d3a9dbbcd80fc209983d97e325 100644 (file)
@@ -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
index 80ab250baa2d11282350bd9fcfc2a467a7eefea4..b0c2cd226f4d79feb8638ab1a076dcc2d1bc6422 100644 (file)
@@ -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