diff options
| -rw-r--r-- | sci-biology/foldingathome/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-biology/foldingathome/Manifest | 4 | ||||
| -rw-r--r-- | sci-biology/foldingathome/files/6.02/fah-init | 23 |
3 files changed, 13 insertions, 19 deletions
diff --git a/sci-biology/foldingathome/ChangeLog b/sci-biology/foldingathome/ChangeLog index e4f1e5d074cf..0ce23c3c0776 100644 --- a/sci-biology/foldingathome/ChangeLog +++ b/sci-biology/foldingathome/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-biology/foldingathome # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.23 2008/08/03 03:23:11 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.24 2008/11/22 04:37:22 je_fro Exp $ + + 22 Nov 2008; Jeff Gardner <je_fro@gentoo.org> files/6.02/fah-init: + Changing to use init script from Constantin Baranov on bug #218331 03 Aug 2008; Jeff Gardner <je_fro@gentoo.org> -files/6.02_beta1/fah-init, -files/6.02_beta1/folding-conf.d, -files/6.02_beta1/initfolding, diff --git a/sci-biology/foldingathome/Manifest b/sci-biology/foldingathome/Manifest index 4ae5fd9cee3a..94836ec0e635 100644 --- a/sci-biology/foldingathome/Manifest +++ b/sci-biology/foldingathome/Manifest @@ -1,4 +1,4 @@ -AUX 6.02/fah-init 1022 RMD160 4dd4b11d142ffabc6a6541affb502791dbc8459f SHA1 4eefb8b954c78fd30c21a991411474d530aebbf8 SHA256 4d680a90cac4a0f0f79fe6c398a4cef6a43c4a3ebe77dfe3336a5202eeaf2709 +AUX 6.02/fah-init 832 RMD160 30d6d59d937515e7198bf66c91e5cfcb6e7a8509 SHA1 6ebcf227a4d0d7fe6098fd1f354a98f9b0fd63af SHA256 e0042cea2d207aae5598bbdbe02337297d9e18120040665caf404e6d8c290ce6 AUX 6.02/folding-conf.d 860 RMD160 b9a48ad7a5baaaf098c874690158cdad8bc34f18 SHA1 a5e29236f9f5241c905d584d8297860ae4380505 SHA256 f3debbdf6423abcf159a99dfe2539975a7df2c1940008921c07253dbaa5083aa AUX 6.02/initfolding 155 RMD160 0055bd01f02b2b4bd4b270eba238207873146ed1 SHA1 b82e2fcd080a27c2792c8e390f5cdd7717e4b3dc SHA256 e315dcbb436967d357c8ca5e8f09fe9d4624343c73848c301fff989f6e901128 AUX copy_client_config-5.0.2-r1 393 RMD160 530642f45d1d83612aa6a8048f6ed5fbab67176b SHA1 5a3951b4fe98f62ae3e20269dabd5cfbf3554d77 SHA256 ddfe7ace77006273d1ac64aec4280fdecf52ea0f435dacf2d1bba3de3da42abe @@ -11,5 +11,5 @@ DIST FAH6.02-Linux.tgz 139883 RMD160 a543bdb0e385281c064880ca55a92388a22372a6 SH EBUILD foldingathome-5.0.2-r3.ebuild 1982 RMD160 a3a8bbaf21d5d50dc50f58f7313ecfa05c619392 SHA1 de7f263dbdba60c4a94419cfbedd3b78265377f6 SHA256 a0a0a6eb97dd353fe0be39007a7c88e07d1cb52d6eaf724bc7d04a7761916de4 EBUILD foldingathome-5.0.2-r5.ebuild 1998 RMD160 3aef065261ff2671a3116ad064a81e82f2279fb6 SHA1 82a6f896a77a34c111de154922b144bc39781deb SHA256 6f23ec58995581abc800b08c5ce9744f5dd36de895795853db9d04257ebe03ec EBUILD foldingathome-6.02.ebuild 1786 RMD160 7d872bbe99140c144c670eb147206d25028e35a8 SHA1 7b52182bcd3fc477d377ad70433091dc4bdd2c17 SHA256 01d3b2d7fdb414ccfab91e8f02f59f7c066b3420a66d9de9a9d55f2cf47c935c -MISC ChangeLog 8341 RMD160 3ec7f8abda3d77385f6d792a458e6e87f3748a1a SHA1 35f90b4adba1dbc6c0026aa60d07d7c6d421b5c1 SHA256 a0422b22d95a5e537f24951cb399c2cddfeac777c9d1a7c0628408d863b65434 +MISC ChangeLog 8480 RMD160 054da88dcb10d208e1be584bc45b50682ddcbe89 SHA1 448a994f1d368a677471ae354625f145be1f81a3 SHA256 a7e573b78a05ea878ef64f1bb909af4f36020c4a4c1b865ede88c51bb73f5500 MISC metadata.xml 164 RMD160 2f441200f2672ab5f1efae7cbdb08b284603903c SHA1 61a50baedfd041e663d6c2a41a28b57e22dbb6de SHA256 f0897b09e661dc603041dab249d73253034659189becf1a34cca37a7d51ef72f diff --git a/sci-biology/foldingathome/files/6.02/fah-init b/sci-biology/foldingathome/files/6.02/fah-init index c728c592a937..1447b0910d63 100644 --- a/sci-biology/foldingathome/files/6.02/fah-init +++ b/sci-biology/foldingathome/files/6.02/fah-init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/files/6.02/fah-init,v 1.1 2008/08/03 03:19:59 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/files/6.02/fah-init,v 1.2 2008/11/22 04:37:22 je_fro Exp $ opts="${opts} unitinfo" @@ -13,24 +13,15 @@ unitinfo() { start() { ebegin "Starting Folding@Home" cd /opt/foldingathome/amd64-smp - start-stop-daemon -v --chdir ${PWD} --chuid foldingathome --nicelevel 19 --start --background --exec ./fah6 -- ${FOLD_OPTS} + start-stop-daemon --chdir ${PWD} --chuid foldingathome --nicelevel 19 \ + --make-pidfile --pidfile "${PIDFILE}" \ + --start --background --exec ./fah6 -- ${FOLD_OPTS} eend $? } stop() { ebegin "Stopping Folding@Home" - start-stop-daemon -vv --stop --user foldingathome --exec /opt/foldingathome/amd64-smp/fah6 - cd /opt/foldingathome/amd64-smp - for I in FahCore*.exe; do - if ps ax|grep $I > /dev/null 2>&1; then - killall -q $I > /dev/null 2>&1 - fi - done - sleep 1 - if ps ax|grep '[/]opt[/]foldingathome[/]amd64-smp[/]fah6' > /dev/null 2>&1; then - eend 1 - else - eend 0 - fi + start-stop-daemon --stop --user foldingathome --pidfile "${PIDFILE}" + eend $? + killall --user foldingathome --signal SIGKILL } - |