| 1 |
armin76 08/12/28 12:00:27 |
| 2 |
|
| 3 |
Modified: deluged.init deluged.conf |
| 4 |
Log: |
| 5 |
Enhance init script, thanks to Alex Kravtsov and Kevin Bowling on bug #238733 |
| 6 |
(Portage version: 2.1.6.3/cvs/Linux 2.6.27-gentoo-r7 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 net-p2p/deluge/files/deluged.init |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: deluged.init |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- deluged.init 7 Jul 2008 10:39:17 -0000 1.2 |
| 22 |
+++ deluged.init 28 Dec 2008 12:00:27 -0000 1.3 |
| 23 |
@@ -1,7 +1,7 @@ |
| 24 |
#!/sbin/runscript |
| 25 |
# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License, v2 or later |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.2 2008/07/07 10:39:17 armin76 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.3 2008/12/28 12:00:27 armin76 Exp $ |
| 29 |
|
| 30 |
depend() { |
| 31 |
need net |
| 32 |
@@ -27,17 +27,28 @@ |
| 33 |
eerror "Your group has to exist too!" |
| 34 |
return 1 |
| 35 |
fi |
| 36 |
- fi |
| 37 |
+ fi |
| 38 |
return 0 |
| 39 |
} |
| 40 |
|
| 41 |
start() { |
| 42 |
checkconfig || return $? |
| 43 |
+ DELUGED_USER_HOME=`getent passwd | grep $( echo "${DELUGED_USER}" | cut -d ':' -f 1 ) | cut -d ':' -f 6` |
| 44 |
ebegin "Starting Deluged" |
| 45 |
start-stop-daemon --start --user "${DELUGED_USER}" \ |
| 46 |
--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \ |
| 47 |
- --exec /usr/bin/deluged -- --do-not-daemonize "${DELUGED_OPTS}" |
| 48 |
+ --exec /usr/bin/deluged -c "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}" |
| 49 |
eend $? |
| 50 |
+ |
| 51 |
+ |
| 52 |
+ if [[ "${DELUGEUI_START}" == "true" ]] ; then |
| 53 |
+ ebegin "Starting Deluge" |
| 54 |
+ start-stop-daemon --start --background --pidfile \ |
| 55 |
+ /var/run/deluge.pid --make-pidfile \ |
| 56 |
+ --exec /usr/bin/deluge -c "${DELUGED_USER}" \ |
| 57 |
+ -e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS} |
| 58 |
+ eend $? |
| 59 |
+ fi |
| 60 |
} |
| 61 |
|
| 62 |
stop() { |
| 63 |
@@ -45,4 +56,12 @@ |
| 64 |
start-stop-daemon --stop --user "${DELUGED_USER}" \ |
| 65 |
--name deluged --pidfile /var/run/deluged.pid |
| 66 |
eend $? |
| 67 |
+ |
| 68 |
+ |
| 69 |
+ if [[ "${DELUGEUI_START}" == "true" ]] ; then |
| 70 |
+ ebegin "Stopping Deluge" |
| 71 |
+ start-stop-daemon --stop --user "${DELUGED_USER}" \ |
| 72 |
+ --name deluge --pidfile /var/run/deluge.pid |
| 73 |
+ eend $? |
| 74 |
+ fi |
| 75 |
} |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.2 net-p2p/deluge/files/deluged.conf |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.conf?rev=1.2&view=markup |
| 82 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.conf?rev=1.2&content-type=text/plain |
| 83 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.conf?r1=1.1&r2=1.2 |
| 84 |
|
| 85 |
Index: deluged.conf |
| 86 |
=================================================================== |
| 87 |
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.conf,v |
| 88 |
retrieving revision 1.1 |
| 89 |
retrieving revision 1.2 |
| 90 |
diff -u -r1.1 -r1.2 |
| 91 |
--- deluged.conf 12 Jun 2008 15:44:36 -0000 1.1 |
| 92 |
+++ deluged.conf 28 Dec 2008 12:00:27 -0000 1.2 |
| 93 |
@@ -2,3 +2,6 @@ |
| 94 |
# Change this to the user you want to run deluged as. |
| 95 |
# You may specify a group too, after a colon |
| 96 |
DELUGED_USER="" |
| 97 |
+DELUGEUI_START="false" |
| 98 |
+DELUGEUI_OPTS="-u web" |
| 99 |
+ |
Archives