From b74bbfac7ee4499818986e513c87cdd54e180665 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Thu, 22 Mar 2007 16:44:09 +0000 Subject: [PATCH] Fix init script, bug 119181, thanks to Francisco Lloret for the fix Package-Manager: portage-2.1.2.2 --- net-p2p/amule/ChangeLog | 6 +++++- net-p2p/amule/Manifest | 16 ++++++++-------- net-p2p/amule/files/amuled.initd | 18 ++++++++++-------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog index 548701b9c7d6..11d5df12a89b 100644 --- a/net-p2p/amule/ChangeLog +++ b/net-p2p/amule/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-p2p/amule # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.85 2007/03/16 20:44:58 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.86 2007/03/22 16:44:09 armin76 Exp $ + + 22 Mar 2007; Raúl Porcel files/amuled.initd: + Fix init script, bug 119181, thanks to Francisco Lloret for the fix *amule-2.2.0_pre20070316 (16 Mar 2007) diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest index 38c980d33c92..069f2ffbf4fc 100644 --- a/net-p2p/amule/Manifest +++ b/net-p2p/amule/Manifest @@ -2,10 +2,10 @@ AUX amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 SHA1 b58729 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 files/amuled.confd 409 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a files/amuled.confd 409 -AUX amuled.initd 1138 RMD160 fbe6a700515cdadf288b3ebe486664228a8ac1a7 SHA1 e693e190586b42f04edbf0c30c2b36efb490965c SHA256 0e52035f2ac1a7f7a3bf3cf7f300b9ae829da525f98846121e8eeeee5c617cc4 -MD5 37c7ee8278a02051a68d062beba82fbc files/amuled.initd 1138 -RMD160 fbe6a700515cdadf288b3ebe486664228a8ac1a7 files/amuled.initd 1138 -SHA256 0e52035f2ac1a7f7a3bf3cf7f300b9ae829da525f98846121e8eeeee5c617cc4 files/amuled.initd 1138 +AUX amuled.initd 1162 RMD160 0874caa90c27dbe8d1a47fe58451f97b0e63e82e SHA1 289d15bf6709913272ed9f5c5a98d2ae05b390d1 SHA256 5f284b4cae4a4ba2bd05a50131d281de9a4720f05951106686682e18d681a70d +MD5 e8850899208304f14c6df60af07301f9 files/amuled.initd 1162 +RMD160 0874caa90c27dbe8d1a47fe58451f97b0e63e82e files/amuled.initd 1162 +SHA256 5f284b4cae4a4ba2bd05a50131d281de9a4720f05951106686682e18d681a70d files/amuled.initd 1162 AUX amuleweb.confd 758 RMD160 aa7565de986afd065b7715a196fffeb30394dd03 SHA1 a03edf4222ffb34ae5adf78619ebb09ad3a25d38 SHA256 f201d4ffd6cae939776d625105a0c53586cd831f2de983913e2dd61f7c932052 MD5 a10ba0e3eace37231ef0aab8a91d312c files/amuleweb.confd 758 RMD160 aa7565de986afd065b7715a196fffeb30394dd03 files/amuleweb.confd 758 @@ -29,10 +29,10 @@ EBUILD amule-2.2.0_pre20070316.ebuild 3132 RMD160 35dfb8dd170100f331c193614fb17a MD5 2e172ca1cccaba130a70f684221784e5 amule-2.2.0_pre20070316.ebuild 3132 RMD160 35dfb8dd170100f331c193614fb17a6fb5ac28ca amule-2.2.0_pre20070316.ebuild 3132 SHA256 e2a4779f1c946f59638455ac06c60ce3e262c4698fe6dd2eb862d9ca9983c96a amule-2.2.0_pre20070316.ebuild 3132 -MISC ChangeLog 11925 RMD160 9e7b9c204f588bc7f38cfc6ab04d62c7704d8044 SHA1 531a2890f70ce0309473b6b27722a511facc8a61 SHA256 f1e38f37988aee7235523b7d2c1fa6598e21a794ea67bcd43e57bec47194756d -MD5 b5b15b5324827009cf866ac7caec0737 ChangeLog 11925 -RMD160 9e7b9c204f588bc7f38cfc6ab04d62c7704d8044 ChangeLog 11925 -SHA256 f1e38f37988aee7235523b7d2c1fa6598e21a794ea67bcd43e57bec47194756d ChangeLog 11925 +MISC ChangeLog 12095 RMD160 ffc76be268c3575e2624f23797d3b1c931bb6fe2 SHA1 62bd4560343538b65630d23059656deaa0615e40 SHA256 605a8f1bebabfd29d8ce8546c51f2fb3f657b32642f8a3fbb2024fee1113fd38 +MD5 4b66ed56a545a55dae0fda8b6e1cf736 ChangeLog 12095 +RMD160 ffc76be268c3575e2624f23797d3b1c931bb6fe2 ChangeLog 12095 +SHA256 605a8f1bebabfd29d8ce8546c51f2fb3f657b32642f8a3fbb2024fee1113fd38 ChangeLog 12095 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160 diff --git a/net-p2p/amule/files/amuled.initd b/net-p2p/amule/files/amuled.initd index 4ebdf747e291..0a8da7064f9e 100644 --- a/net-p2p/amule/files/amuled.initd +++ b/net-p2p/amule/files/amuled.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuled.initd,v 1.2 2005/08/27 17:17:55 sekretarz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuled.initd,v 1.3 2007/03/22 16:44:09 armin76 Exp $ depend() { need net @@ -13,12 +13,12 @@ start() { return 1 fi - if pgrep -u ${AMULEUSER} amuled >/dev/null; then - eerror "An instance of aMule webserver is already running" - return 1 - fi + if pgrep -u ${AMULEUSER} amuled >/dev/null; then + eerror "An instance of aMule webserver is already running" + return 1 + fi - rm /var/run/amuled.pid + rm /var/run/amuled.pid ebegin "Starting aMule Daemon" env HOME="${AMULEHOME}" start-stop-daemon --start \ @@ -35,13 +35,15 @@ start() { } stop() { - ebegin "Stopping aMule daemon" + ebegin "Stopping aMule daemon -- please wait" start-stop-daemon --oknodo --stop --pidfile /var/run/amuled.pid &>/dev/null eend $? } restart() { svc_stop - sleep 3 + while `pgrep -u ${AMULEUSER} amuled >/dev/null`; do + sleep 1 + done svc_start } -- 2.26.2