Changeset 29067

Timestamp:

2011-11-13T23:16:02+01:00 (6 years ago)

Author:

nico

Message:

packages/subversion: use new service functions

Location:

packages/net/subversion

Files:

• Makefile (modified) (1 diff)
• files/subversion.init (modified) (2 diffs)

packages/net/subversion/Makefile

@@ -10 +10 @@
 PKG_NAME:=subversion
 PKG_VERSION:=1.6.17
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

packages/net/subversion/files/subversion.init

@@ -1 +1 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-start_service () {
+start_instance () {
         local section="$1"
-        config_get path "$section" path
-        config_get port "$section" port
+        config_get path "$section" 'path'
+        config_get port "$section" 'port'
 
         if [ ! -d "$path" ]; then
@@ -17 +18 @@
                 echo
                 echo "Changing the path using UCI (default path is: /var/local/svn):"
-                echo "        uci set subversion.cfg1.path="/srv/svn""
+                echo "        uci set subversion.@[0].path="/srv/svn""
                 echo "        uci commit"
                 echo "        /etc/init.d/subversion restart"
-                exit 1
+                return 1
         fi
 
-        svnserve -d --listen-port ${port} -r ${path}
+        service_start /usr/bin/svnserve -d --listen-port ${port} -r ${path}
 }
 
 start() {
-        config_load "subversion"
-        config_foreach start_service subversion
+        config_load 'subversion'
+        config_foreach start_instance 'subversion'
 }
 
 stop() {
-        killall -9 svnserve
+        SERVICE_SIG_STOP="INT" \
+        service_stop /usr/bin/svnserve
 }