diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2009-10-05 16:58:06 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-10-05 16:58:06 +0000 |
commit | b26913c381e97e6078ab50b0750b349344132df3 (patch) | |
tree | accc4238bf7c482a483f0d226fb590df3065a1ef /package/dnsmasq/files/dnsmasq.init | |
parent | 9b85366192e652354298f0bc0b2e48ce5f633480 (diff) | |
download | master-187ad058-b26913c381e97e6078ab50b0750b349344132df3.tar.gz master-187ad058-b26913c381e97e6078ab50b0750b349344132df3.tar.bz2 master-187ad058-b26913c381e97e6078ab50b0750b349344132df3.zip |
[package] dnsmasq:
- make "name" option in "host" sections optional and append it to -G if set,
allows specifying hostnames for static leases without resorting to /etc/hosts
- implement "domain" sections, allows defining arbitary host names and associated
ptr records from uci
- bump package revision
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17897 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/dnsmasq/files/dnsmasq.init')
-rw-r--r-- | package/dnsmasq/files/dnsmasq.init | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index 1aeeb94b26..ba1bf721dd 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -3,6 +3,7 @@ START=60 DNS_SERVERS="" +DOMAIN="" dhcp_calc() { local ip="$1" @@ -83,6 +84,8 @@ dnsmasq() { append_parm "$cfg" "tftp_root" "--tftp-root" append_parm "$cfg" "dhcp_boot" "--dhcp-boot" + config_get DOMAIN "$cfg" domain + config_get leasefile $cfg leasefile [ -e "$leasefile" ] || touch "$leasefile" config_get_bool cachelocal "$cfg" cachelocal 1 @@ -165,7 +168,7 @@ dhcp_host_add() { local cfg="$1" config_get name "$cfg" name - [ -n "$name" ] || return 0 + [ -n "$name" ] && dhcp_option_add "$cfg" "$name" config_get mac "$cfg" mac [ -n "$mac" ] || return 0 @@ -173,9 +176,7 @@ dhcp_host_add() { config_get ip "$cfg" ip [ -n "$ip" ] || return 0 - append args "--dhcp-host=$mac,$ip" - - dhcp_option_add "$cfg" "$name" + append args "--dhcp-host=$mac,$ip${name:+,$name}" } dhcp_mac_add() { @@ -270,6 +271,20 @@ dhcp_option_add() { } +dhcp_domain_add() { + local cfg="$1" + + config_get name "$cfg" name + [ -n "$name" ] || return 0 + + config_get ip "$cfg" ip + [ -n "$ip" ] || return 0 + + local oIFS="$IFS"; IFS="."; set -- $ip; IFS="$oIFS" + append args "-A /$name${DOMAIN:+.$DOMAIN}/$ip" + append args "--ptr-record=$4.$3.$2.$1.in-addr.arpa,$name${DOMAIN:+.$DOMAIN}" +} + start() { include /lib/network scan_interfaces @@ -285,6 +300,7 @@ start() { config_foreach dhcp_circuitid_add circuitid config_foreach dhcp_remoteid_add remoteid config_foreach dhcp_subscrid_add subscrid + config_foreach dhcp_domain_add domain config_foreach dhcp_add dhcp /usr/sbin/dnsmasq $args && { |