dnsmasq: fix jail_mount for serversfile

[openwrt/staging/mkresin.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
old mode 100644 (file)
new mode 100755 (executable)
index 19135af..c4ca3eb
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -197,12 +197,12 @@ ismounted() {
        for dirname in $EXTRA_MOUNT ; do
                case "$filename" in
                        "${dirname}/"* | "${dirname}" )
-                               return 1
+                               return 0
                                ;;
                esac
        done
 
-       return 0
+       return 1
 }
 
 append_addnhosts() {
@@ -332,7 +332,7 @@ dhcp_match_add() {
 
 dhcp_host_add() {
        local cfg="$1"
-       local hosttag nametime addrs duids macs tags
+       local hosttag nametime addrs duids macs tags mtags
 
        config_get_bool force "$cfg" force 0
 
@@ -357,6 +357,11 @@ dhcp_host_add() {
        config_get duid "$cfg" duid
        config_get tag "$cfg" tag
 
+       add_tag() {
+               mtags="${mtags}tag:$1,"
+       }
+       config_list_foreach "$cfg" match_tag add_tag
+
        if [ -n "$mac" ]; then
                # --dhcp-host=00:20:e0:3b:13:af,192.168.0.199,lap
                # many MAC are possible to track a laptop ON/OFF dock
@@ -394,9 +399,9 @@ dhcp_host_add() {
 
        if [ $DNSMASQ_DHCP_VER -eq 6 ]; then
                addrs="${ip:+,$ip}${hostid:+,[::$hostid]}"
-               xappend "--dhcp-host=$macs${duids:+,$duids}$hosttag$addrs$nametime"
+               xappend "--dhcp-host=$mtags$macs${duids:+,$duids}$hosttag$addrs$nametime"
        else
-               xappend "--dhcp-host=$macs$hosttag${ip:+,$ip}$nametime"
+               xappend "--dhcp-host=$mtags$macs$hosttag${ip:+,$ip}$nametime"
        fi
 }
 
@@ -815,7 +820,7 @@ dnsmasq_ipset_add() {
 dnsmasq_start()
 {
        local cfg="$1"
-       local disabled user_dhcpscript
+       local disabled user_dhcpscript logfacility
        local resolvfile resolvdir localuse=0
 
        config_get_bool disabled "$cfg" disabled 0
@@ -928,7 +933,7 @@ dnsmasq_start()
        append_bool "$cfg" scriptarp "--script-arp"
 
        append_parm "$cfg" logfacility "--log-facility"
-
+       config_get logfacility "$cfg" "logfacility"
        append_parm "$cfg" cachesize "--cache-size"
        append_parm "$cfg" dnsforwardmax "--dns-forward-max"
        append_parm "$cfg" port "--port"
@@ -961,13 +966,20 @@ dnsmasq_start()
                xappend "--addn-hosts=$HOSTFILE"
                append EXTRA_MOUNT "$HOSTFILE"
        else
-               xappend "--addn-hosts=$(dirname $HOSTFILE)"
-               append EXTRA_MOUNT "$(dirname $HOSTFILE)"
+               xappend "--addn-hosts=$HOSTFILE_DIR"
+               append EXTRA_MOUNT "$HOSTFILE_DIR"
        fi
        config_list_foreach "$cfg" "addnhosts" append_addnhosts
        config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
        append_parm "$cfg" "leasefile" "--dhcp-leasefile" "/tmp/dhcp.leases"
-       append_parm "$cfg" "serversfile" "--servers-file"
+
+       local serversfile
+       config_get serversfile "$cfg" "serversfile"
+       [ -n "$serversfile" ] && {
+               xappend "--servers-file=$serversfile"
+               append EXTRA_MOUNT "$serversfile"
+       }
+
        append_parm "$cfg" "tftp_root" "--tftp-root"
        append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
        append_parm "$cfg" "local_ttl" "--local-ttl"
@@ -1151,13 +1163,21 @@ dnsmasq_start()
        [ -n "$user_dhcpscript" ] && procd_set_param env USER_DHCPSCRIPT="$user_dhcpscript"
        procd_set_param respawn
 
+       local instance_ifc instance_netdev
+       config_get instance_ifc "$cfg" interface
+       [ -n "$instance_ifc" ] && network_get_device instance_netdev "$instance_ifc" &&
+               [ -n "$instance_netdev" ] && procd_set_param netdev $instance_netdev
+
        procd_add_jail dnsmasq ubus log
        procd_add_jail_mount $CONFIGFILE $DHCPBOGUSHOSTNAMEFILE $DHCPSCRIPT $DHCPSCRIPT_DEPENDS
        procd_add_jail_mount $EXTRA_MOUNT $RFC6761FILE $TRUSTANCHORSFILE
        procd_add_jail_mount $dnsmasqconffile $dnsmasqconfdir $resolvdir $user_dhcpscript
        procd_add_jail_mount /etc/passwd /etc/group /etc/TZ /etc/hosts /etc/ethers
-       [ "$HOSTFILE_DIR" != "/tmp" ] && procd_add_jail_mount "$HOSTFILE_DIR"
        procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
+       case "$logfacility" in */*)
+               [ ! -e "$logfacility" ] && touch "$logfacility"
+               procd_add_jail_mount_rw "$logfacility"
+       esac
 
        procd_close_instance
 }