summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerkan Kaba <serkan@gentoo.org>2008-12-20 18:12:23 +0000
committerSerkan Kaba <serkan@gentoo.org>2008-12-20 18:12:23 +0000
commit87955e4a0578d50df34dece5ffe60267d430c3db (patch)
tree10b859f67fa90dd12dc50cd595943216bf4354a0 /www-servers/tomcat/files
parentStable on ppc wrt bug 251643 (diff)
downloadhistorical-87955e4a0578d50df34dece5ffe60267d430c3db.tar.gz
historical-87955e4a0578d50df34dece5ffe60267d430c3db.tar.bz2
historical-87955e4a0578d50df34dece5ffe60267d430c3db.zip
Fix initscripts for openrc-0.4.0 reported in bug #243348. Thanks to Mike Weissman <mike@weisso.com> for testing and the patch.
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r2 x86_64
Diffstat (limited to 'www-servers/tomcat/files')
-rwxr-xr-xwww-servers/tomcat/files/5.5/tomcat.init.24
-rwxr-xr-xwww-servers/tomcat/files/6/tomcat.init4
2 files changed, 4 insertions, 4 deletions
diff --git a/www-servers/tomcat/files/5.5/tomcat.init.2 b/www-servers/tomcat/files/5.5/tomcat.init.2
index 6211c9baa85d..8a3ea514a17c 100755
--- a/www-servers/tomcat/files/5.5/tomcat.init.2
+++ b/www-servers/tomcat/files/5.5/tomcat.init.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init.2,v 1.7 2008/12/19 20:48:47 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init.2,v 1.8 2008/12/20 18:12:23 serkan Exp $
init_env_vars() {
if [ "$(gjl -p tomcat-5.5 --get-vm)" ] ; then
@@ -105,7 +105,7 @@ stop() {
ebegin "Stopping Tomcat"
init_env_vars
start-stop-daemon --stop --quiet \
- --make-pidfile --pidfile /var/run/tomcat-5.5.pid \
+ --pidfile /var/run/tomcat-5.5.pid \
--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} ${STD_OUT} stop
eend $?
}
diff --git a/www-servers/tomcat/files/6/tomcat.init b/www-servers/tomcat/files/6/tomcat.init
index 34178058e203..ccaef7f2b891 100755
--- a/www-servers/tomcat/files/6/tomcat.init
+++ b/www-servers/tomcat/files/6/tomcat.init
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.9 2008/12/19 20:48:47 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.10 2008/12/20 18:12:23 serkan Exp $
init_env_vars() {
# Populate JAVA_HOME
@@ -96,7 +96,7 @@ stop() {
ebegin "Stopping Tomcat"
init_env_vars
start-stop-daemon --stop --quiet \
- --make-pidfile --pidfile /var/run/tomcat-6.pid \
+ --pidfile /var/run/tomcat-6.pid \
--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} stop ${STD_OUT}
eend $?
}