diff options
| author |   Jean-Noël Rivasseau <elvanor@gentoo.org> | 2011-04-08 11:25:06 +0000 |
|---|---|---|
| committer | Jean-Noël Rivasseau <elvanor@gentoo.org> | 2011-04-08 11:25:06 +0000 |
| commit | d6c8ff818b472c217b458b891d1d7b59ad8c2175 (patch) | |
| tree | 26613a627c916a5c88b5a49912b5ac12e783d66a /www-servers | |
| parent | Fix DEPEND value. (diff) | |
| download | gentoo-2-d6c8ff818b472c217b458b891d1d7b59ad8c2175.tar.gz gentoo-2-d6c8ff818b472c217b458b891d1d7b59ad8c2175.tar.bz2 gentoo-2-d6c8ff818b472c217b458b891d1d7b59ad8c2175.zip | |
Fixed init scripts again.
(Portage version: 2.1.9.42/cvs/Linux i686)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 7 | ||||
| -rw-r--r-- | www-servers/tomcat/files/6/tomcat.init.2 | 8 | ||||
| -rw-r--r-- | www-servers/tomcat/files/6/tomcat.init.3 | 8 |
3 files changed, 14 insertions, 9 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 9c5feb3ed934..b6a091e63de6 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.251 2011/04/07 14:13:49 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.252 2011/04/08 11:25:06 elvanor Exp $ + + 08 Apr 2011; <elvanor@gentoo.org> files/6/tomcat.init.2, + files/6/tomcat.init.3: + Fixed again init scripts so that catalina.out is not empty if running + without OpenRC. *tomcat-7.0.12 (07 Apr 2011) diff --git a/www-servers/tomcat/files/6/tomcat.init.2 b/www-servers/tomcat/files/6/tomcat.init.2 index 10738925e96f..9e08e07014ef 100644 --- a/www-servers/tomcat/files/6/tomcat.init.2 +++ b/www-servers/tomcat/files/6/tomcat.init.2 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2011 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.2,v 1.2 2011/04/05 17:36:16 elvanor Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2,v 1.3 2011/04/08 11:25:06 elvanor Exp $ opts="${opts} forcestop" @@ -47,20 +47,20 @@ init_env_vars() { ssd() { local exec=${1} shift - local args="--start --quiet --background \ + local args="--start --quiet \ --chdir "${CATALINA_TMPDIR}" \ --chuid ${CATALINA_USER}:${CATALINA_GROUP} \ --make-pidfile --pidfile /var/run/tomcat-6.pid" # bug #243348 if [ -e /etc/init.d/sysfs ] ; then - args="${args} \ + args="${args} --background \ --stdout ${CATALINA_BASE}/logs/catalina.out \ --stderr ${CATALINA_BASE}/logs/catalina.out" start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} else start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> \ - "${CATALINA_BASE}/logs/catalina.out" 2>&1 + "${CATALINA_BASE}/logs/catalina.out" 2>&1 & fi return $? } diff --git a/www-servers/tomcat/files/6/tomcat.init.3 b/www-servers/tomcat/files/6/tomcat.init.3 index 17c92aa51c3e..dd5c2667bf01 100644 --- a/www-servers/tomcat/files/6/tomcat.init.3 +++ b/www-servers/tomcat/files/6/tomcat.init.3 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2011 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.3,v 1.2 2011/04/05 17:36:16 elvanor Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3,v 1.3 2011/04/08 11:25:06 elvanor Exp $ opts="${opts} forcestop" @@ -47,20 +47,20 @@ init_env_vars() { ssd() { local exec=${1} shift - local args="--start --quiet --background \ + local args="--start --quiet \ --chdir "${CATALINA_TMPDIR}" \ --chuid ${CATALINA_USER}:${CATALINA_GROUP} \ --make-pidfile --pidfile /var/run/tomcat-6.pid" # bug #243348 if [ -e /etc/init.d/sysfs ] ; then - args="${args} \ + args="${args} --background \ --stdout ${CATALINA_BASE}/logs/catalina.out \ --stderr ${CATALINA_BASE}/logs/catalina.out" start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} else start-stop-daemon ${args} --name ${exec} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> \ - "${CATALINA_BASE}/logs/catalina.out" 2>&1 + "${CATALINA_BASE}/logs/catalina.out" 2>&1 & fi return $? } |