Changeset 29179

Timestamp:

2011-11-16T10:44:25+01:00 (6 years ago)

Author:

nico

Message:

packages/transmission: use new service functions, rename 'run_daemon_as_user' config option to 'user'

Location:

packages/net/transmission

Files:

• Makefile (modified) (1 diff)
• files/transmission.config (modified) (1 diff)
• files/transmission.init (modified) (6 diffs)

packages/net/transmission/Makefile

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

packages/net/transmission/files/transmission.config

@@ -2 +2 @@
         option enabled 0
         option config_dir '/tmp/transmission'
-        option run_daemon_as_user root
+        #option user 'nobody'
         option alt_speed_down 50
         option alt_speed_enabled false

packages/net/transmission/files/transmission.init

@@ -1 +1 @@
 #!/bin/sh /etc/rc.common
+# Copyright (C) 2010-2011 OpenWrt.org
 
 START=99
-BIN=/usr/bin/transmission-daemon
-SSD=start-stop-daemon
 
 LIST_SEP="
 "
+
 append_params() {
         local p; local v; local s="$1"; shift
@@ -14 +14 @@
                 for v in $v; do
                         [ -n "$v" ] && (
-                                echo "\""$p"\": "$v"," | sed -e 's|_|-|g' >> $config_dir/settings.json
+                                echo "\""$p"\": "$v"," | sed -e 's|_|-|g' >> $config_file
                         )
                 done
@@ -28 +28 @@
                 for v in $v; do
                         [ -n "$v" ] && (
-                                echo -n "\""$p | sed -e 's|/|\\/|g;s|_|-|g' >> $config_dir/settings.json; \
-                                echo "\": \""$v"\"," >> $config_dir/settings.json
+                                echo -n "\""$p | sed -e 's|/|\\/|g;s|_|-|g' >> $config_file; \
+                                echo "\": \""$v"\"," >> $config_file
                         )
                 done
@@ -36 +36 @@
 }
 
-start_service() {
+section_enabled() {
+        config_get_bool enabled "$1" 'enabled' 0
+        [ $enabled -gt 0 ]
+}
+
+start_instance() {
         local s="$1"
-        local enabled=0
-        local run_as_usr='root'
+        local user
         local open_file_limit=0
         local ulimit_files=$(ulimit -n)
 
-        # disabled?
-        config_get_bool enabled "$s" enabled 0
-        [ "$enabled" = 0 ] && return 0
-        config_get config_dir "$s" config_dir '/tmp/transmission'
-        mkdir -p "$config_dir"
-        config_get run_as_usr "$s" run_daemon_as_user 'root'
+        section_enabled "$section" || return 1
 
-        echo "{" > $config_dir/settings.json
+        config_get config_dir "$s" 'config_dir' '/var/etc/transmission'
+        config_get user "$s" 'user'
+
+        config_file="$config_dir/settings.json"
+        [ -d $config_dir ] || {
+                mkdir -m 0755 -p "$config_dir"
+                touch $config_file
+                [ -z "$user" ] || chown -R $user $config_dir
+        }
+
+        echo "{" > $config_file
 
         append_params "$s" \
@@ -75 +84 @@
                 rpc_username rpc_whitelist script_torrent_done_filename watch_dir
 
-        echo "\""invalid-key"\": false" >> $config_dir/settings.json
-        echo "}" >> $config_dir/settings.json
+        echo "\""invalid-key"\": false" >> $config_file
+        echo "}" >> $config_file
 
-        chown -R $run_as_usr $config_dir
-
-        config_get open_file_limit "$s" open_file_limit 32
+        config_get open_file_limit "$s" 'open_file_limit' 32
         open_limit_files=$(($open_file_limit + 8))
 
@@ -87 +94 @@
         fi
 
-        eval "$SSD -c $run_as_usr -q -b -x $BIN -S -- -g $config_dir"
+        SERVICE_UID="$user" \
+        service_start /usr/bin/transmission-daemon -g $config_dir
+}
+
+stop_instance() {
+        local s="$1"
+        local user
+
+        section_enabled "$section" || return 1
+
+        config_get user "$s" 'user'
+
+        SERVICE_UID="$user" \
+        service_stop /usr/bin/transmission-daemon
 }
 
 start() {
-        config_load transmission
-        config_foreach start_service transmission
+        config_load 'transmission'
+        config_foreach start_instance 'transmission'
 }
 
 stop() {
-        service_kill $(basename $BIN)
+        config_load 'transmission'
+        config_foreach stop_instance 'transmission'
 }
-
-restart() {
-        stop; sleep 5; start
-}