ser2net: fix dynamic config generation (refs #5302)

Signed-off-by: Michael Heimpold <[email protected]>
openwrt · Jan 18, 2018 · e3e2c08 · e3e2c08
1 parent e1f66e0
commit e3e2c08
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/net/ser2net/Makefile b/net/ser2net/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ser2net
 PKG_VERSION:=3.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ser2net
@@ -46,7 +46,7 @@ define Package/ser2net/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ser2net $(1)/usr/sbin/
 
 	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/ser2net.conf $(1)/etc/
+	$(INSTALL_CONF) ./files/ser2net.conf $(1)/etc/
 
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/ser2net.config $(1)/etc/config/ser2net

diff --git a/net/ser2net/files/ser2net.config b/net/ser2net/files/ser2net.config
@@ -1,4 +1,4 @@
-config global
+config ser2net global
 	option enabled 1
 
 config controlport

diff --git a/net/ser2net/files/ser2net.init b/net/ser2net/files/ser2net.init
@@ -165,7 +165,7 @@ start_service() {
 
 	config_load ser2net
 
-	config_get_bool enabled ser2net enabled 0
+	config_get_bool enabled global enabled 0
 	[ "$enabled" -gt 0 ] || return 0
 
 	cat "$STATICCFGFILE" - 2>/dev/null <<-EOF > "$DYNAMICCFGFILE"