diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2010-03-31 19:19:27 +0000 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2010-03-31 19:19:27 +0000 |
| commit | 823d9a005fa6e158eb7e350ecc79e468b5eb2c89 (patch) | |
| tree | 603ee3ba1b2831de402854368187023af1336508 /net-p2p | |
| parent | Version bump. (diff) | |
| download | gentoo-2-823d9a005fa6e158eb7e350ecc79e468b5eb2c89.tar.gz gentoo-2-823d9a005fa6e158eb7e350ecc79e468b5eb2c89.tar.bz2 gentoo-2-823d9a005fa6e158eb7e350ecc79e468b5eb2c89.zip | |
Apply changes from bug 273138
(Portage version: 2.2_rc67-r3/cvs/Linux x86_64)
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/fms/ChangeLog | 5 | ||||
| -rw-r--r-- | net-p2p/fms/files/fms | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/net-p2p/fms/ChangeLog b/net-p2p/fms/ChangeLog index aa97cf7d0d10..b17cb7eb6567 100644 --- a/net-p2p/fms/ChangeLog +++ b/net-p2p/fms/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-p2p/fms # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.16 2010/03/13 17:51:31 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.17 2010/03/31 19:19:27 tommy Exp $ + + 31 Mar 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> files/fms: + Apply changes from bug 273138 *fms-0.3.51 (13 Mar 2010) diff --git a/net-p2p/fms/files/fms b/net-p2p/fms/files/fms index 2f26c39c10a4..36763ce2cfd1 100644 --- a/net-p2p/fms/files/fms +++ b/net-p2p/fms/files/fms @@ -1,11 +1,16 @@ #!/sbin/runscript # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/files/fms,v 1.3 2009/02/12 18:07:25 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/files/fms,v 1.4 2010/03/31 19:19:27 tommy Exp $ + +# Check for OpenRC/Baselayout 2 - see bug #270646 +is_openrc() { + [ -f /lib/librc.so -o -f /etc/init.d/sysfs -o -f /lib/rc/version ] +} start() { ebegin "Starting FMS" - if [[ -f /etc/init.d/sysfs ]]; then + if is_openrc; then start-stop-daemon -S -u freenet:freenet -d /var/freenet/fms -b -x /usr/bin/fms eend $? else @@ -17,7 +22,7 @@ start() { stop() { ebegin "Stopping FMS" - if [[ -f /etc/init.d/sysfs ]]; then + if is_openrc; then start-stop-daemon -K -u freenet:freenet -d /var/freenet/fms /usr/bin/fms eend $? else |