From: olli <olli@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 18 Sep 2007 17:08:11 +0000 (+0000)
Subject: gmediaserver: migrate configuration to UCI
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=600de8d5822e8be11d5e02eeaa6d216559e14363;p=packages.git

gmediaserver: migrate configuration to UCI

git-svn-id: svn://svn.openwrt.org/openwrt/packages@8834 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/gmediaserver/Makefile b/net/gmediaserver/Makefile
index d463f5519..a108bcf38 100644
--- 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
index 000000000..ba1fc9fbd
--- /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
index aef2f0199..000000000
--- 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 dba14e4f2..4fc606748 100644
--- 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() {