ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-22 06:57:57 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

make "name" parameter optional in dnsmasq "boot" config sections

Browse Source 
SVN-Revision: 14557
This commit is contained in:
Jo-Philipp Wich 2009-02-18 22:00:36 +00:00
parent 357ed07a84
commit cd978f4531
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/dnsmasq/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.47 PKG_VERSION:=2.47
PKG_RELEASE:=1 PKG_RELEASE:=2
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

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

@ -182,7 +182,6 @@ dhcp_boot_add() {
local cfg="$1" local cfg="$1"
config_get name "$cfg" name config_get name "$cfg" name
[ -n "$name" ] || return 0
config_get filename "$cfg" filename config_get filename "$cfg" filename
[ -n "$filename" ] || return 0 [ -n "$filename" ] || return 0
@ -193,7 +192,7 @@ dhcp_boot_add() {
config_get serveraddress "$cfg" serveraddress config_get serveraddress "$cfg" serveraddress
[ -n "$serveraddress" ] || return 0 [ -n "$serveraddress" ] || return 0
append args "--dhcp-boot=net:$name,$filename,$servername,$serveraddress" append args "--dhcp-boot=${name:+net:$name,}$filename,$servername,$serveraddress"
dhcp_option_add "$cfg" "$name" dhcp_option_add "$cfg" "$name"
} }