[package] ppp: prevent duplicate hotplug for non uci managed ppp interfaces (#9275)

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

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 9bd6225..cd5a78a 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


@@ -399,6 +399,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
 }