qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-13 06:13:44 +02:00
Code

[PATCH 1/4] 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32568 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-07-01 11:32:29 +00:00
parent b6a1b5d84d
commit 2caf3c66a2
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 config_list_foreach "$cfg" rebind_domain append_rebind_domain
} }
dhcp_option_add "$cfg" "" 0
echo >> $CONFIGFILE echo >> $CONFIGFILE
} }
@ -362,7 +364,7 @@ dhcp_option_add() {
config_get dhcp_option "$cfg" dhcp_option config_get dhcp_option "$cfg" dhcp_option
for o in $dhcp_option; do for o in $dhcp_option; do
xappend "--dhcp-option${force:+-force}=$networkid","$o" xappend "--dhcp-option${force:+-force}=${networkid:+$networkid,}$o"
done done
} }