diff options
| author |   Serkan Kaba <serkan@gentoo.org> | 2008-12-20 18:12:23 +0000 |
|---|---|---|
| committer | Serkan Kaba <serkan@gentoo.org> | 2008-12-20 18:12:23 +0000 |
| commit | 57533730abc3cfca5ef3fc48f69a322a76a6fd71 (patch) | |
| tree | 27d08240d43f966c7e0f6af1d4add1bdff3ea560 /www-servers | |
| parent | Stable on ppc wrt bug 251643 (diff) | |
| download | gentoo-2-57533730abc3cfca5ef3fc48f69a322a76a6fd71.tar.gz gentoo-2-57533730abc3cfca5ef3fc48f69a322a76a6fd71.tar.bz2 gentoo-2-57533730abc3cfca5ef3fc48f69a322a76a6fd71.zip | |
Fix initscripts for openrc-0.4.0 reported in bug #243348. Thanks to Mike Weissman <mike@weisso.com> for testing and the patch.
(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 7 | ||||
| -rwxr-xr-x | www-servers/tomcat/files/5.5/tomcat.init.2 | 4 | ||||
| -rwxr-xr-x | www-servers/tomcat/files/6/tomcat.init | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index bfe31fd61eb9..bbd31cac3329 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.203 2008/12/19 20:48:47 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.204 2008/12/20 18:12:22 serkan Exp $ + + 20 Dec 2008; Serkan Kaba <serkan@gentoo.org> files/5.5/tomcat.init.2, + files/6/tomcat.init: + Fix initscripts for openrc-0.4.0 reported in bug #243348. Thanks to Mike + Weissman <mike@weisso.com> for testing and the patch. *tomcat-6.0.18-r2 (19 Dec 2008) *tomcat-5.5.27-r2 (19 Dec 2008) 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 $? } |