summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-p2p/deluge/ChangeLog6
-rw-r--r--net-p2p/deluge/files/deluged.init8
2 files changed, 11 insertions, 3 deletions
diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index c1cc9c71f11d..e8c4852bc1ed 100644
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-p2p/deluge
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.115 2009/02/16 14:14:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.116 2009/02/17 15:32:17 armin76 Exp $
+
+ 17 Feb 2009; Raúl Porcel <armin76@gentoo.org> files/deluged.init:
+ add DELUGED_HOME support in config, wrt bug #259278, thanks to Maks
+ Polunin <ph0enix at ngs dot ru>
*deluge-1.1.3 (16 Feb 2009)
diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
index 85984257ae05..f9b2a306a405 100644
--- a/net-p2p/deluge/files/deluged.init
+++ b/net-p2p/deluge/files/deluged.init
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.4 2009/01/15 09:43:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.5 2009/02/17 15:32:17 armin76 Exp $
depend() {
need net
@@ -33,7 +33,11 @@ checkconfig() {
start() {
checkconfig || return $?
- DELUGED_USER_HOME=`getent passwd | grep ^$( echo "${DELUGED_USER}" | cut -d ':' -f 1 ): | cut -d ':' -f 6`
+ if [[ "${DELUGED_HOME}" == "" ]] ; then
+ DELUGED_USER_HOME=`getent passwd | grep ^$( echo "${DELUGED_USER}" | cut -d ':' -f 1 ): | cut -d ':' -f 6`
+ else
+ DELUGED_USER_HOME="${DELUGED_HOME}"
+ fi
ebegin "Starting Deluged"
start-stop-daemon --start --user "${DELUGED_USER}" \
--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \