qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-01-11 22:00:14 +02:00
Code

[package] make "name" parameter optional in dnsmasq "boot" config sections

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14557 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2009-02-18 22:00:36 +00:00
parent 8e777a33d8
commit 64b2ab7e62
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"
} }