public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-p2p/deluge/files: deluged.init
@ 2008-07-07 10:39 Raul Porcel (armin76)
  0 siblings, 0 replies; 8+ messages in thread
From: Raul Porcel (armin76) @ 2008-07-07 10:39 UTC (permalink / raw
  To: gentoo-commits

armin76     08/07/07 10:39:17

  Modified:             deluged.init
  Log:
  Fix typo in init script, bug #231035
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.2                  net-p2p/deluge/files/deluged.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?r1=1.1&r2=1.2

Index: deluged.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deluged.init	12 Jun 2008 15:44:36 -0000	1.1
+++ deluged.init	7 Jul 2008 10:39:17 -0000	1.2
@@ -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.1 2008/06/12 15:44:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.2 2008/07/07 10:39:17 armin76 Exp $
 
 depend() {
 	need net
@@ -36,7 +36,7 @@
 	ebegin "Starting Deluged"
 	start-stop-daemon --start --user "${DELUGED_USER}" \
 	--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
-	--exec /usr/bin/deluged -- --do-not-daemonize "${DELUDED_OPTS}"
+	--exec /usr/bin/deluged -- --do-not-daemonize "${DELUGED_OPTS}"
 	eend $?
 }
 



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-p2p/deluge/files: deluged.init
@ 2009-01-15  9:43 Raul Porcel (armin76)
  0 siblings, 0 replies; 8+ messages in thread
From: Raul Porcel (armin76) @ 2009-01-15  9:43 UTC (permalink / raw
  To: gentoo-commits

armin76     09/01/15 09:43:15

  Modified:             deluged.init
  Log:
  Revbump so users get the fix on the init script, bug #254995, thanks to Matt Farmer <matt at mattfarmer dot net> for the fix
  (Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r2 ia64, RepoMan options: --force)

Revision  Changes    Path
1.4                  net-p2p/deluge/files/deluged.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?r1=1.3&r2=1.4

Index: deluged.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deluged.init	28 Dec 2008 12:00:27 -0000	1.3
+++ deluged.init	15 Jan 2009 09:43:15 -0000	1.4
@@ -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.3 2008/12/28 12:00:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.4 2009/01/15 09:43:15 armin76 Exp $
 
 depend() {
 	need net
@@ -33,7 +33,7 @@
 
 start() {
 	checkconfig || return $?
-	DELUGED_USER_HOME=`getent passwd | grep $( echo "${DELUGED_USER}" | cut -d ':' -f 1 ) | cut -d ':' -f 6`
+	DELUGED_USER_HOME=`getent passwd | grep ^$( echo "${DELUGED_USER}" | cut -d ':' -f 1 ): | cut -d ':' -f 6`
 	ebegin "Starting Deluged"
 	start-stop-daemon --start --user "${DELUGED_USER}" \
 	--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-p2p/deluge/files: deluged.init
@ 2009-02-17 15:32 Raul Porcel (armin76)
  0 siblings, 0 replies; 8+ messages in thread
From: Raul Porcel (armin76) @ 2009-02-17 15:32 UTC (permalink / raw
  To: gentoo-commits

armin76     09/02/17 15:32:17

  Modified:             deluged.init
  Log:
  add DELUGED_HOME support in config, wrt bug #259278, thanks to Maks Polunin <ph0enix at ngs dot ru>
  (Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 ia64)

Revision  Changes    Path
1.5                  net-p2p/deluge/files/deluged.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/deluge/files/deluged.init?r1=1.4&r2=1.5

Index: deluged.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- deluged.init	15 Jan 2009 09:43:15 -0000	1.4
+++ deluged.init	17 Feb 2009 15:32:17 -0000	1.5
@@ -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 @@
 
 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 \






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-p2p/deluge/files: deluged.init
@ 2010-10-02 15:36 Raul Porcel (armin76)
  0 siblings, 0 replies; 8+ messages in thread
From: Raul Porcel (armin76) @ 2010-10-02 15:36 UTC (permalink / raw
  To: gentoo-commits

armin76     10/10/02 15:36:03

  Modified:             deluged.init
  Log:
  Update init script, bug #339352, bug #288599, thanks to Juanlu Pérez <juanluperez at gmail dot com>, Paolo Pedroni <paolo dot pedroni at iol dot it> and Michał Górny <mgorny at gentoo dot org>
  (Portage version: 2.1.8.3/cvs/Linux ia64)

Revision  Changes    Path
1.6                  net-p2p/deluge/files/deluged.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?r1=1.5&r2=1.6

Index: deluged.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- deluged.init	17 Feb 2009 15:32:17 -0000	1.5
+++ deluged.init	2 Oct 2010 15:36:03 -0000	1.6
@@ -1,28 +1,28 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 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.5 2009/02/17 15:32:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.6 2010/10/02 15:36:03 armin76 Exp $
 
 depend() {
 	need net
 }
 
 checkconfig() {
-	if [[ "${DELUGED_USER}" == "" ]] ; then
+	if [ "${DELUGED_USER}" = "" ] ; then
 		eerror "Please edit /etc/conf.d/deluged"
 		eerror "You have to specify a user to run deluged as, as we will not run it as root!"
 		eerror "Modify DELUGED_USER to your needs (you can also add a group, after a colon)"
 		return 1
 	fi
-	if ! `getent passwd | cut -d ':' -f 1 | grep $( echo "${DELUGED_USER}" | cut -d ':' -f 1 ) -sq` ; then
+	if ! getent passwd "${DELUGED_USER%:*}" >/dev/null ; then
 		eerror "Please edit /etc/conf.d/deluged"
 		eerror "Your user has to exist!"
 		return 1
 	fi
-	if ! `echo "${DELUGED_USER}" | grep ':' -sq` ; then
+	if [ "${DELUGED_USER%:*}" = "${DELUGED_USER}" ] ; then
 		return 0
 	else
-		if ! `cut -d ':' -f 1 /etc/group | grep $( echo "${DELUGED_USER}" | cut -d ':' -f 2 ) -sq` ; then
+		if ! getent group "${DELUGED_USER#*:}" >/dev/null ; then
 			eerror "Please edit /etc/conf.d/deluged"
 			eerror "Your group has to exist too!"
 			return 1
@@ -33,10 +33,10 @@
 
 start() {
 	checkconfig || return $?
-	if [[ "${DELUGED_HOME}" == "" ]] ; then
-		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 "${DELUGED_USER%:*}" | cut -d ':' -f 6)
 	else
-		DELUGED_USER_HOME="${DELUGED_HOME}"
+		DELUGED_USER_HOME=${DELUGED_HOME}
 	fi
 	ebegin "Starting Deluged"
 	start-stop-daemon --start --user "${DELUGED_USER}" \
@@ -45,7 +45,7 @@
 	eend $?
 
 	
-	if [[ "${DELUGEUI_START}" == "true" ]] ; then
+	if [ "${DELUGEUI_START}" = "true" ] ; then
 		ebegin "Starting Deluge"
 		start-stop-daemon --start --background --pidfile \
 		/var/run/deluge.pid  --make-pidfile \
@@ -62,7 +62,7 @@
 	eend $?
 
 
-	if [[ "${DELUGEUI_START}" == "true" ]] ; then
+	if [ "${DELUGEUI_START}" = "true" ] ; then
 		ebegin "Stopping Deluge"
 		start-stop-daemon --stop --user "${DELUGED_USER}" \
 		--name deluge --pidfile /var/run/deluge.pid






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-p2p/deluge/files: deluged.init
@ 2011-08-07 13:16 Raul Porcel (armin76)
  0 siblings, 0 replies; 8+ messages in thread
From: Raul Porcel (armin76) @ 2011-08-07 13:16 UTC (permalink / raw
  To: gentoo-commits

armin76     11/08/07 13:16:39

  Modified:             deluged.init
  Log:
  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)

Revision  Changes    Path
1.7                  net-p2p/deluge/files/deluged.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?r1=1.6&r2=1.7

Index: deluged.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- deluged.init	2 Oct 2010 15:36:03 -0000	1.6
+++ deluged.init	7 Aug 2011 13:16:39 -0000	1.7
@@ -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 @@
 		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 @@
 		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






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-p2p/deluge/files: deluged.init
@ 2011-09-17 18:13 Raul Porcel (armin76)
  0 siblings, 0 replies; 8+ messages in thread
From: Raul Porcel (armin76) @ 2011-09-17 18:13 UTC (permalink / raw
  To: gentoo-commits

armin76     11/09/17 18:13:14

  Modified:             deluged.init
  Log:
  Fix init script, bug #380713
  
  (Portage version: 2.1.10.11/cvs/Linux ia64)

Revision  Changes    Path
1.8                  net-p2p/deluge/files/deluged.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?r1=1.7&r2=1.8

Index: deluged.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- deluged.init	7 Aug 2011 13:16:39 -0000	1.7
+++ deluged.init	17 Sep 2011 18:13:14 -0000	1.8
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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.7 2011/08/07 13:16:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.8 2011/09/17 18:13:14 armin76 Exp $
 
 depend() {
 	need net
@@ -41,7 +41,7 @@
 	ebegin "Starting Deluged"
 	start-stop-daemon --start --user "${DELUGED_USER%:*}" \
 	--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
-	--exec /usr/bin/deluged -u "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
+	--exec /usr/bin/deluged -c "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
 	eend $?
 
 	
@@ -49,7 +49,7 @@
 		ebegin "Starting Deluge"
 		start-stop-daemon --start --background --pidfile \
 		/var/run/deluge.pid  --make-pidfile \
-		--exec /usr/bin/deluge -u "${DELUGED_USER}" \
+		--exec /usr/bin/deluge -c "${DELUGED_USER}" \
 		-e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
 		eend $?
 	fi






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-p2p/deluge/files: deluged.init
@ 2011-09-17 18:39 Raul Porcel (armin76)
  0 siblings, 0 replies; 8+ messages in thread
From: Raul Porcel (armin76) @ 2011-09-17 18:39 UTC (permalink / raw
  To: gentoo-commits

armin76     11/09/17 18:39:52

  Modified:             deluged.init
  Log:
  Proper fix to init script, thanks to jdhore
  
  (Portage version: 2.1.10.11/cvs/Linux ia64)

Revision  Changes    Path
1.9                  net-p2p/deluge/files/deluged.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?r1=1.8&r2=1.9

Index: deluged.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- deluged.init	17 Sep 2011 18:13:14 -0000	1.8
+++ deluged.init	17 Sep 2011 18:39:52 -0000	1.9
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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.8 2011/09/17 18:13:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.9 2011/09/17 18:39:52 armin76 Exp $
 
 depend() {
 	need net
@@ -41,7 +41,7 @@
 	ebegin "Starting Deluged"
 	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 --chuid "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
 	eend $?
 
 	
@@ -49,7 +49,7 @@
 		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 --chuid "${DELUGED_USER}" \
 		-e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
 		eend $?
 	fi






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-p2p/deluge/files: deluged.init
@ 2011-09-21 14:56 Raul Porcel (armin76)
  0 siblings, 0 replies; 8+ messages in thread
From: Raul Porcel (armin76) @ 2011-09-21 14:56 UTC (permalink / raw
  To: gentoo-commits

armin76     11/09/21 14:56:39

  Modified:             deluged.init
  Log:
  Fix init script, again
  
  (Portage version: 2.1.10.11/cvs/Linux ia64)

Revision  Changes    Path
1.10                 net-p2p/deluge/files/deluged.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/files/deluged.init?r1=1.9&r2=1.10

Index: deluged.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- deluged.init	17 Sep 2011 18:39:52 -0000	1.9
+++ deluged.init	21 Sep 2011 14:56:39 -0000	1.10
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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.9 2011/09/17 18:39:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.10 2011/09/21 14:56:39 armin76 Exp $
 
 depend() {
 	need net
@@ -41,7 +41,7 @@
 	ebegin "Starting Deluged"
 	start-stop-daemon --start --user "${DELUGED_USER%:*}" \
 	--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
-	--exec /usr/bin/deluged --chuid "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
+	--exec /usr/bin/deluged -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
 	eend $?
 
 	
@@ -49,7 +49,7 @@
 		ebegin "Starting Deluge"
 		start-stop-daemon --start --background --pidfile \
 		/var/run/deluge.pid  --make-pidfile \
-		--exec /usr/bin/deluge --chuid "${DELUGED_USER}" \
+		--exec /usr/bin/deluge --user "${DELUGED_USER%:*}" \
 		-e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
 		eend $?
 	fi
@@ -57,14 +57,14 @@
 
 stop() {
 	ebegin "Stopping Deluged"
-	start-stop-daemon --stop --user "${DELUGED_USER}" \
+	start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
 	--name deluged --pidfile /var/run/deluged.pid
 	eend $?
 
 
 	if [ "${DELUGEUI_START}" = "true" ] ; then
 		ebegin "Stopping Deluge"
-		start-stop-daemon --stop --user "${DELUGED_USER}" \
+		start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
 		--name deluge --pidfile /var/run/deluge.pid
 		eend $?
 	fi






^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2011-09-21 14:56 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-21 14:56 [gentoo-commits] gentoo-x86 commit in net-p2p/deluge/files: deluged.init Raul Porcel (armin76)
  -- strict thread matches above, loose matches on Subject: below --
2011-09-17 18:39 Raul Porcel (armin76)
2011-09-17 18:13 Raul Porcel (armin76)
2011-08-07 13:16 Raul Porcel (armin76)
2010-10-02 15:36 Raul Porcel (armin76)
2009-02-17 15:32 Raul Porcel (armin76)
2009-01-15  9:43 Raul Porcel (armin76)
2008-07-07 10:39 Raul Porcel (armin76)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox