diff options
| author |   Marcin Kryczek <mkay@gentoo.org> | 2005-09-18 13:12:59 +0000 |
|---|---|---|
| committer | Marcin Kryczek <mkay@gentoo.org> | 2005-09-18 13:12:59 +0000 |
| commit | de7835b763fbe4493b299002f0574c32a281a77a (patch) | |
| tree | 476acdf31835084442762bb566489c3e805636bf /net-p2p | |
| parent | php update (diff) | |
| download | gentoo-2-de7835b763fbe4493b299002f0574c32a281a77a.tar.gz gentoo-2-de7835b763fbe4493b299002f0574c32a281a77a.tar.bz2 gentoo-2-de7835b763fbe4493b299002f0574c32a281a77a.zip | |
We do not want to return from start() function without eend. Fixed with additional variable . Also fixed bug #103433
(Portage version: 1.589-cvs)
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/mldonkey/ChangeLog | 6 | ||||
| -rw-r--r-- | net-p2p/mldonkey/files/mldonkey.initd | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog index f895a541a460..9d20f3890006 100644 --- a/net-p2p/mldonkey/ChangeLog +++ b/net-p2p/mldonkey/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-p2p/mldonkey # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.95 2005/09/16 23:36:36 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.96 2005/09/18 13:12:59 mkay Exp $ + + 18 Sep 2005; <mkay@gentoo.org> files/mldonkey.initd: + Fixed init script. Thanks M. Giritli <giritli@sonne.uni-freiburg.de> for bug + #103433 16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog: Converted to UTF-8, fixed encoding screwups diff --git a/net-p2p/mldonkey/files/mldonkey.initd b/net-p2p/mldonkey/files/mldonkey.initd index 5179a7b795df..b86a7360f10f 100644 --- a/net-p2p/mldonkey/files/mldonkey.initd +++ b/net-p2p/mldonkey/files/mldonkey.initd @@ -7,6 +7,7 @@ depend() { } start() { + result=0 ebegin "Starting mldonkey" if [ ! -d ${BASEDIR}/${SUBDIR} ] then @@ -18,30 +19,27 @@ start() { if [ ! -d ${BASEDIR} ] then eerror "Directory ${BASEDIR} could not be created!" - return 1 + result=$(( ${result} + 1 )) fi fi su ${USER} -c "mkdir ${BASEDIR}/${SUBDIR}" if [ ! -d ${BASEDIR}/${SUBDIR} ] then eerror "Directory ${BASEDIR}/${SUBDIR} could not be created!" - return 1 + result=$(( ${result} + 1 )) fi einfo "...ok!" fi cd ${BASEDIR}/${SUBDIR}/ env HOME=${BASEDIR} start-stop-daemon --quiet --start -c ${USER} \ - -x /usr/bin/mlnet &>${LOG} & + --nicelevel ${NICE} -x /usr/bin/mlnet &>${LOG} & sleep 5 if ! pgrep -u ${USER} mlnet >/dev/null then eerror "MLDonkey could not be started! Check logfile: ${LOG}" + result=$(( ${result} + 1 )) fi - for i in `pgrep -u ${USER} mlnet` - do - renice ${NICE} -p $i > /dev/null - done - eend $? + eend $result } stop() { |