gmediaserver: migrate configuration to UCI

SVN-Revision: 8834

diff --git a/net/gmediaserver/Makefile b/net/gmediaserver/Makefile
index d463f5519d2415807e4ac30bf57d2fa6e060d956..a108bcf38f5b46ccdffcca1bc9a2a838b431af1b 100644 (file)
--- a/net/gmediaserver/Makefile
+++ b/net/gmediaserver/Makefile
@@ -52,8 +52,8 @@ MAKE_FLAGS += \
 define Package/gmediaserver/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc/default
-       $(INSTALL_DATA) ./files/$(PKG_NAME).default $(1)/etc/default/$(PKG_NAME)
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME)
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
 endef

diff --git a/net/gmediaserver/files/gmediaserver.config b/net/gmediaserver/files/gmediaserver.config
new file mode 100644 (file)
index 0000000..ba1fc9f
--- /dev/null
+++ b/net/gmediaserver/files/gmediaserver.config
@@ -0,0 +1,3 @@
+config gmediaserver
+       option content_directory '/tmp'
+       option interface         'br-lan'

diff --git a/net/gmediaserver/files/gmediaserver.default b/net/gmediaserver/files/gmediaserver.default
deleted file mode 100644 (file)
index aef2f01..0000000
--- a/net/gmediaserver/files/gmediaserver.default
+++ /dev/null
@@ -1 +0,0 @@
-OPTIONS="--background --interface=br-lan --pid-file=$PID_F"

diff --git a/net/gmediaserver/files/gmediaserver.init b/net/gmediaserver/files/gmediaserver.init
index dba14e4f2214ae6701904a4c5dfa08d473ba067b..4fc606748dbd63b08c389085f1e86d492a2080c5 100644 (file)
--- a/net/gmediaserver/files/gmediaserver.init
+++ b/net/gmediaserver/files/gmediaserver.init
@@ -8,8 +8,17 @@ RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
 
 start() {
-       [ -f $DEFAULT ] && . $DEFAULT
-       $BIN $OPTIONS
+       mkdir -p $RUN_D
+       config_load gmediaserver
+       config_foreach start_service gmediaserver
+}
+
+start_service() {
+       local cfg="$1"
+       config_get content_directory "$cfg" content_directory
+       config_get interface         "$cfg" interface
+
+       $BIN --background --interface=${interface:-br-lan} --pid-file=$PID_F ${content_directory:-/tmp}
 }
 
 stop() {