Просмотр исходного кода

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

SVN-Revision: 14557
Jo-Philipp Wich 17 лет назад
Родитель
Сommit
cd978f4531
2 измененных файлов с 2 добавлено и 3 удалено
  1. 1 1
      package/dnsmasq/Makefile
  2. 1 2
      package/dnsmasq/files/dnsmasq.init

+ 1 - 1
package/dnsmasq/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.47
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq

+ 1 - 2
package/dnsmasq/files/dnsmasq.init

@@ -182,7 +182,6 @@ dhcp_boot_add() {
 	local cfg="$1"
 
 	config_get name "$cfg" name
-	[ -n "$name" ] || return 0
 
 	config_get filename "$cfg" filename
 	[ -n "$filename" ] || return 0
@@ -193,7 +192,7 @@ dhcp_boot_add() {
 	config_get serveraddress "$cfg" serveraddress
 	[ -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"
 }