diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile index a2b43530e..f22d74327 100644 --- a/net/isc-dhcp/Makefile +++ b/net/isc-dhcp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=isc-dhcp UPSTREAM_NAME:=dhcp PKG_VERSION:=4.4.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE @@ -196,7 +196,7 @@ define Package/isc-dhcp-relay-$(BUILD_VARIANT)/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(1)/usr/sbin $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/etc/config/dhcrelay $(1)/etc/config + $(INSTALL_DATA) ./files/dhcrelay.conf $(1)/etc/config $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dhcrelay4.init $(1)/etc/init.d/dhcrelay4 endef diff --git a/net/isc-dhcp/files/dhcpd.init b/net/isc-dhcp/files/dhcpd.init index fdcbe2490..8eb20d101 100644 --- a/net/isc-dhcp/files/dhcpd.init +++ b/net/isc-dhcp/files/dhcpd.init @@ -122,7 +122,7 @@ static_hosts() { typeof() { echo "$1" | awk ' -/^\d+\.\d+\.\d+\.d+$/ { print "ip\n"; next; } +/^\d+\.\d+\.\d+\.\d+$/ { print "ip\n"; next; } /^(true|false)$/ { print "bool\n"; next; } /^\d+$/ { print "integer\n"; next; } /^"[^"]*"$/ { print "string\n"; next; } diff --git a/net/isc-dhcp/files/etc/config/dhcrelay b/net/isc-dhcp/files/dhcrelay.conf similarity index 100% rename from net/isc-dhcp/files/etc/config/dhcrelay rename to net/isc-dhcp/files/dhcrelay.conf