qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 23:16:16 +02:00
Code

[backfire] merge r24051

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24052 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-11-21 13:54:09 +00:00
parent 8d2aec4be2
commit 517adf6366
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/dnsmasq/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.55 PKG_VERSION:=2.55
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq

9
package/dnsmasq/files/dnsmasq.init
View File

@ -271,7 +271,7 @@ dhcp_add() {
DNS_SERVERS="$DNS_SERVERS $dnsserver" DNS_SERVERS="$DNS_SERVERS $dnsserver"
} }
append_bool "$cfg" ignore "-2 '$ifname'" && return 0 append_bool "$cfg" ignore "-2 $ifname" && return 0
config_get proto "$net" proto config_get proto "$net" proto
[ static = "$proto" ] || return 0 [ static = "$proto" ] || return 0
@ -283,7 +283,12 @@ dhcp_add() {
#check for an already active dhcp server on the interface, unless 'force' is set #check for an already active dhcp server on the interface, unless 'force' is set
config_get_bool force "$cfg" force 0 config_get_bool force "$cfg" force 0
[ $force -gt 0 ] || { [ $force -gt 0 ] || {
udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && return 0 udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && {
logger -t dnsmasq \
"found already running DHCP-server on interface '$ifname'" \
"refusing to start, use 'option force 1' to override"
return 0
}
} }
config_get start "$cfg" start config_get start "$cfg" start