dnsmasq: add dhcp-script hook for other packages

[openwrt/openwrt.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 5221db46f627cfebe044bba2989188c070ed44fb..62a3169c6787e560b8321b048dd6a2c5a86bb6a0 100644 (file)
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -18,6 +18,7 @@ TRUSTANCHORSFILE="/usr/share/dnsmasq/trust-anchors.conf"
 TIMEVALIDFILE="/var/state/dnsmasqsec"
 BASEDHCPSTAMPFILE="/var/run/dnsmasq"
 RFC6761FILE="/usr/share/dnsmasq/rfc6761.conf"
 TIMEVALIDFILE="/var/state/dnsmasqsec"
 BASEDHCPSTAMPFILE="/var/run/dnsmasq"
 RFC6761FILE="/usr/share/dnsmasq/rfc6761.conf"

+DHCPSCRIPT="/usr/lib/dnsmasq/dhcp-script.sh"

 
 DNSMASQ_DHCP_VER=4
 
 
 DNSMASQ_DHCP_VER=4
 


@@ -696,7 +697,7 @@ dhcp_relay_add() {
 
 dnsmasq_start()
 {
 
 dnsmasq_start()
 {

-       local cfg="$1" disabled resolvfile
+       local cfg="$1" disabled resolvfile user_dhcpscript

 
        config_get_bool disabled "$cfg" disabled 0
        [ "$disabled" -gt 0 ] && return 0
 
        config_get_bool disabled "$cfg" disabled 0
        [ "$disabled" -gt 0 ] && return 0


@@ -791,7 +792,7 @@ dnsmasq_start()
        append_bool "$cfg" noping "--no-ping"
 
        append_parm "$cfg" logfacility "--log-facility"
        append_bool "$cfg" noping "--no-ping"
 
        append_parm "$cfg" logfacility "--log-facility"

-       append_parm "$cfg" dhcpscript "--dhcp-script"
+

        append_parm "$cfg" cachesize "--cache-size"
        append_parm "$cfg" dnsforwardmax "--dns-forward-max"
        append_parm "$cfg" port "--port"
        append_parm "$cfg" cachesize "--cache-size"
        append_parm "$cfg" dnsforwardmax "--dns-forward-max"
        append_parm "$cfg" port "--port"


@@ -831,7 +832,8 @@ dnsmasq_start()
        config_get_bool readethers "$cfg" readethers
        [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
 
        config_get_bool readethers "$cfg" readethers
        [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
 

-       config_get dhcpscript $cfg dhcpscript
+       xappend "--dhcp-script=$DHCPSCRIPT"
+       config_get user_dhcpscript $cfg dhcpscript

 
        config_get leasefile $cfg leasefile "/tmp/dhcp.leases"
        [ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
 
        config_get leasefile $cfg leasefile "/tmp/dhcp.leases"
        [ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"


@@ -971,6 +973,7 @@ dnsmasq_start()
        procd_open_instance $cfg
        procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid
        procd_set_param file $CONFIGFILE
        procd_open_instance $cfg
        procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid
        procd_set_param file $CONFIGFILE

+       [ -n "$user_dhcpscript" ] && procd_set_param env USER_DHCPSCRIPT="$user_dhcpscript"

        procd_set_param respawn
 
        local dnsmasqconffile="/etc/dnsmasq.${cfg}.conf"
        procd_set_param respawn
 
        local dnsmasqconffile="/etc/dnsmasq.${cfg}.conf"


@@ -979,7 +982,7 @@ dnsmasq_start()
        fi
 
        procd_add_jail dnsmasq ubus log
        fi
 
        procd_add_jail dnsmasq ubus log

-       procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $dhcpscript /etc/hosts /etc/ethers $EXTRA_MOUNT
+       procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT

        procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
 
        procd_close_instance
        procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
 
        procd_close_instance