KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

package/dnsmasq: permit dhcp_option in global dnsmasq config section

Browse source 
dnsmasq currently permits dhcp_options to be specified only in "config dhcp"
sections of /etc/config/dhcp. When dnsmasq is providing DHCP service for
multiple subnets and there are multiple "config dhcp" sections without "option
ignore", it makes sense to allow dhcp_options that should apply globally in
the "config dnsmasq" section of /etc/config/dhcp. dhcp_option is a list option.

[jow: rework patch to apply after dhcp-option-force handling got introduced]

Signed-off-by: Mark Mentovai <mark@moxienet.com>

SVN-Revision: 32568
This commit is contained in:
Jo-Philipp Wich 2012-07-01 11:32:29 +00:00
parent 6e419fbdeb
commit 7f573ef7e3
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/dnsmasq/files/dnsmasq.init
View file

@ -143,6 +143,8 @@ dnsmasq() {
config_list_foreach "$cfg" rebind_domain append_rebind_domain
}
dhcp_option_add "$cfg" "" 0
echo >> $CONFIGFILE
}
@ -362,7 +364,7 @@ dhcp_option_add() {
config_get dhcp_option "$cfg" dhcp_option
for o in $dhcp_option; do
xappend "--dhcp-option${force:+-force}=$networkid","$o"
xappend "--dhcp-option${force:+-force}=${networkid:+$networkid,}$o"
done
}