dnsmasq: bump to dnsmasq v2.80test5

[openwrt/staging/wigyori.git] / package / network / services / dnsmasq / files / dnsmasq.init

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 24455ee7d91876b33a0cecde75301b1e7b6973b6..de155524242e0bd2600fb82f645bec5242966114 100644 (file)
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -813,6 +813,7 @@ dnsmasq_start()
        append_bool "$cfg" localise_queries "--localise-queries"
        append_bool "$cfg" readethers "--read-ethers"
        append_bool "$cfg" dbus "--enable-dbus"
+       append_bool "$cfg" ubus "--enable-ubus" 1
        append_bool "$cfg" expandhosts "--expand-hosts"
        config_get tftp_root "$cfg" "tftp_root"
        [ -n "$tftp_root" ] && mkdir -p "$tftp_root" && append_bool "$cfg" enable_tftp "--enable-tftp"
@@ -844,8 +845,10 @@ dnsmasq_start()
        config_list_foreach "$cfg" "rev_server" append_rev_server
        config_list_foreach "$cfg" "address" append_address
        config_list_foreach "$cfg" "ipset" append_ipset
-       config_list_foreach "$cfg" "interface" append_interface
-       config_list_foreach "$cfg" "notinterface" append_notinterface
+       [ -n "$BOOT" ] || {
+               config_list_foreach "$cfg" "interface" append_interface
+               config_list_foreach "$cfg" "notinterface" append_notinterface
+       }
        config_list_foreach "$cfg" "addnhosts" append_addnhosts
        config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
        append_parm "$cfg" "leasefile" "--dhcp-leasefile" "/tmp/dhcp.leases"
@@ -867,9 +870,6 @@ dnsmasq_start()
                ADD_LOCAL_FQDN="$ADD_LOCAL_HOSTNAME"
        fi
 
-       config_get_bool readethers "$cfg" readethers
-       [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
-
        config_get user_dhcpscript $cfg dhcpscript
        if has_handler || [ -n "$user_dhcpscript" ]; then
                xappend "--dhcp-script=$DHCPSCRIPT"
@@ -938,11 +938,12 @@ dnsmasq_start()
 
        xappend "--dhcp-broadcast=tag:needs-broadcast"
 
-       xappend "--hostsdir=$(dirname $HOSTFILE)"
+       xappend "--addn-hosts=$(dirname $HOSTFILE)"
 
        config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d"
-       [ ! -d "$dnsmasqconfdir" ] && mkdir -p $dnsmasqconfdir
        xappend "--conf-dir=$dnsmasqconfdir"
+       dnsmasqconfdir="${dnsmasqconfdir%%,*}"
+       [ ! -d "$dnsmasqconfdir" ] && mkdir -p $dnsmasqconfdir
        xappend "--user=dnsmasq"
        xappend "--group=dnsmasq"
        echo >> $CONFIGFILE_TMP
@@ -966,7 +967,7 @@ dnsmasq_start()
        config_foreach filter_dnsmasq match dhcp_match_add "$cfg"
        config_foreach filter_dnsmasq domain dhcp_domain_add "$cfg"
        config_foreach filter_dnsmasq hostrecord dhcp_hostrecord_add "$cfg"
-       config_foreach filter_dnsmasq relay dhcp_relay_add "$cfg"
+       [ -n "$BOOT" ] || config_foreach filter_dnsmasq relay dhcp_relay_add "$cfg"
 
        echo >> $CONFIGFILE_TMP
        config_foreach filter_dnsmasq srvhost dhcp_srv_add "$cfg"
@@ -983,13 +984,13 @@ dnsmasq_start()
                # Enable RA feature for when/if it is constructed,
                # and RA is selected per interface pool (RA, DHCP, or both),
                # but no one (should) want RA broadcast in syslog
-               config_foreach filter_dnsmasq dhcp dhcp_add "$cfg"
+               [ -n "$BOOT" ] || config_foreach filter_dnsmasq dhcp dhcp_add "$cfg"
                xappend "--enable-ra"
                xappend "--quiet-ra"
                append_bool "$cfg" quietdhcp "--quiet-dhcp6"
 
        elif [ "$DNSMASQ_DHCP_VER" -gt 0 ] ; then
-               config_foreach filter_dnsmasq dhcp dhcp_add "$cfg"
+               [ -n "$BOOT" ] || config_foreach filter_dnsmasq dhcp dhcp_add "$cfg"
        fi
 
 
@@ -1058,6 +1059,7 @@ service_triggers()
 
        config_load dhcp
        config_foreach add_interface_trigger dhcp
+       config_foreach add_interface_trigger relay
 }
 
 boot()
@@ -1070,8 +1072,6 @@ start_service() {
        local instance="$1"
        local instance_found=0
 
-       [ -n "$BOOT" ] && return
-
        . /lib/functions/network.sh
 
        config_cb() {