summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2011-08-07 13:16:39 +0000
committerRaúl Porcel <armin76@gentoo.org>2011-08-07 13:16:39 +0000
commit45c366d480d165b751ff5e03c9d66cf93a1dc19f (patch)
tree5d8fddb76f022054fb10e8b3195c3d7d1e317ac9 /net-p2p
parentSwitch to EAPI 4. Add static libs USE flag. Using --enable/disable-mmx is eno... (diff)
downloadgentoo-2-45c366d480d165b751ff5e03c9d66cf93a1dc19f.tar.gz
gentoo-2-45c366d480d165b751ff5e03c9d66cf93a1dc19f.tar.bz2
gentoo-2-45c366d480d165b751ff5e03c9d66cf93a1dc19f.zip
Fix init script, bug #353620, by Alan Swanson <swanson at ukfsn dot org> and bug #374755
(Portage version: 2.1.10.7/cvs/Linux ia64)
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/deluge/ChangeLog6
-rw-r--r--net-p2p/deluge/files/deluged.init10
2 files changed, 10 insertions, 6 deletions
diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index fa86d622df26..44ba4396e2bd 100644
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-p2p/deluge
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.162 2011/08/07 11:54:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.163 2011/08/07 13:16:39 armin76 Exp $
+
+ 07 Aug 2011; Raúl Porcel <armin76@gentoo.org> files/deluged.init:
+ Fix init script, bug #353620, by Alan Swanson <swanson at ukfsn dot org> and
+ bug #374755
*deluge-1.3.3 (07 Aug 2011)
diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
index b409a8901f55..269ec4c7aa94 100644
--- a/net-p2p/deluge/files/deluged.init
+++ b/net-p2p/deluge/files/deluged.init
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.6 2010/10/02 15:36:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.7 2011/08/07 13:16:39 armin76 Exp $
depend() {
need net
@@ -39,9 +39,9 @@ start() {
DELUGED_USER_HOME=${DELUGED_HOME}
fi
ebegin "Starting Deluged"
- start-stop-daemon --start --user "${DELUGED_USER}" \
+ start-stop-daemon --start --user "${DELUGED_USER%:*}" \
--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
- --exec /usr/bin/deluged -c "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
+ --exec /usr/bin/deluged -u "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
eend $?
@@ -49,7 +49,7 @@ start() {
ebegin "Starting Deluge"
start-stop-daemon --start --background --pidfile \
/var/run/deluge.pid --make-pidfile \
- --exec /usr/bin/deluge -c "${DELUGED_USER}" \
+ --exec /usr/bin/deluge -u "${DELUGED_USER}" \
-e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
eend $?
fi