ser2net: fix dynamic config generation (refs #5302)

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

diff --git a/net/ser2net/Makefile b/net/ser2net/Makefile
index c1dad9f3e7039bb4c8ef8c7b360c9f7e3b8f4676..da33832c7ea9d1041c21fc6035528533092142e1 100644 (file)
--- 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
index 1e9fcaa833bb70aeadee1409e0bc2aebce614749..8ea52163d6f5ca93fac911a64437caa4095a2040 100644 (file)
--- 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
index 59516bee53011623ec9a6d23b2cfdd4e501cde22..2f7a3d5e728a2d1a7f34a2c8dc8881a07e439875 100644 (file)
--- 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"