netifd: update to latest version, fix redundant ifdown hotplug events

[openwrt.git] / package / dnsmasq / files / dnsmasq.init

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 9bd6225..3d9060d 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -100,10 +100,10 @@ dnsmasq() {
        config_get DOMAIN "$cfg" domain
 
        config_get_bool readethers "$cfg" readethers
        config_get DOMAIN "$cfg" domain
 
        config_get_bool readethers "$cfg" readethers

-       [ "$readethers" = "1" ] && [ -e "/etc/ethers" ] || touch /etc/ethers
+       [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers

 
        config_get leasefile $cfg leasefile
 
        config_get leasefile $cfg leasefile

-       [ -n "$leasefile" ] && [ -e "$leasefile" ] || touch "$leasefile"
+       [ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"

        config_get_bool cachelocal "$cfg" cachelocal 1
 
        config_get hostsfile "$cfg" dhcphostsfile
        config_get_bool cachelocal "$cfg" cachelocal 1
 
        config_get hostsfile "$cfg" dhcphostsfile


@@ -206,20 +206,19 @@ dhcp_vendorclass_add() {
 dhcp_host_add() {
        local cfg="$1"
 
 dhcp_host_add() {
        local cfg="$1"
 

-       config_get name "$cfg" name
-

        config_get networkid "$cfg" networkid
        [ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid"
 
        config_get networkid "$cfg" networkid
        [ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid"
 

+       config_get name "$cfg" name

        config_get ip "$cfg" ip
        config_get ip "$cfg" ip

-       [ -n "$ip" ] || return 0
+       [ -n "$ip" ] || [ -n "$name" ] || return 0

 
        macs=""
        config_get mac "$cfg" mac
        for m in $mac; do append macs "$m" ","; done
        [ -n "$macs" ] || return 0
 
 
        macs=""
        config_get mac "$cfg" mac
        for m in $mac; do append macs "$m" ","; done
        [ -n "$macs" ] || return 0
 

-       append args "--dhcp-host=$macs,${networkid:+net:$networkid,}$ip${name:+,$name}"
+       append args "--dhcp-host=$macs${networkid:+,net:$networkid}${ip:+,$ip}${name:+,$name}"

 }
 
 dhcp_mac_add() {
 }
 
 dhcp_mac_add() {


@@ -365,6 +364,19 @@ dhcp_srv_add() {
        append args "-W $service"
 }
 
        append args "-W $service"
 }
 

+dhcp_cname_add() {
+       local cfg="$1"
+       local cname target
+
+       config_get cname "$cfg" cname
+       [ -n "$cname" ] || return 0
+
+       config_get target "$cfg" target
+       [ -n "$target" ] || return 0
+
+       append args "--cname=${cname},${target}"
+}
+

 start() {
        include /lib/network
        scan_interfaces
 start() {
        include /lib/network
        scan_interfaces


@@ -383,6 +395,7 @@ start() {
        config_foreach dhcp_domain_add domain
        config_foreach dhcp_srv_add srvhost
        config_foreach dhcp_add dhcp
        config_foreach dhcp_domain_add domain
        config_foreach dhcp_srv_add srvhost
        config_foreach dhcp_add dhcp

+       config_foreach dhcp_cname_add cname

 
        /usr/sbin/dnsmasq $args && {
                rm -f /tmp/resolv.conf
 
        /usr/sbin/dnsmasq $args && {
                rm -f /tmp/resolv.conf


@@ -399,6 +412,6 @@ stop() {
                rm -f /tmp/resolv.conf
                ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
        }
                rm -f /tmp/resolv.conf
                ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
        }

-       killall dnsmasq
+       service_kill dnsmasq /var/run/dnsmasq.pid

        return 0
 }
        return 0
 }