[gentoo-commits] gentoo-x86 commit in net-p2p/fms/files: fms

[Thomas Sachau (tommy)]

tommy       10/03/31 19:19:27

  Modified:             fms
  Log:
  Apply changes from bug 273138
  (Portage version: 2.2_rc67-r3/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  net-p2p/fms/files/fms

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

Index: fms
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/fms/files/fms,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fms	12 Feb 2009 18:07:25 -0000	1.3
+++ fms	31 Mar 2010 19:19:27 -0000	1.4
@@ -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 @@
 
 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