summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2011-10-18 22:27:52 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2011-10-18 22:27:52 +0000
commit9b4a020df3585447304065397ff0bec3e9975acd (patch)
tree32c9644274c4caafb6d1067bbae7f47414e1737c /www-servers/tomcat/files
parentFix crash when parsing pdf, bug 387049 (diff)
downloadgentoo-2-9b4a020df3585447304065397ff0bec3e9975acd.tar.gz
gentoo-2-9b4a020df3585447304065397ff0bec3e9975acd.tar.bz2
gentoo-2-9b4a020df3585447304065397ff0bec3e9975acd.zip
www-servers/tomcat: warning fixes in initd script
(Portage version: 2.1.10.29/cvs/Linux x86_64)
Diffstat (limited to 'www-servers/tomcat/files')
-rw-r--r--www-servers/tomcat/files/7/tomcat.init8
1 files changed, 4 insertions, 4 deletions
diff --git a/www-servers/tomcat/files/7/tomcat.init b/www-servers/tomcat/files/7/tomcat.init
index 9a8f4bba0e00..9e623a9dfc1b 100644
--- a/www-servers/tomcat/files/7/tomcat.init
+++ b/www-servers/tomcat/files/7/tomcat.init
@@ -1,9 +1,9 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# 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/7/tomcat.init,v 1.1 2010/12/21 09:13:39 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/7/tomcat.init,v 1.2 2011/10/18 22:27:52 fordfrog Exp $
-opts="${opts} forcestop"
+extra_commands="forcestop"
init_env_vars() {
# Populate JAVA_HOME
@@ -44,7 +44,7 @@ ssd() {
shift
start-stop-daemon --start --quiet --background \
--chdir "${CATALINA_TMPDIR}" \
- --chuid ${CATALINA_USER}:${CATALINA_GROUP} \
+ --user ${CATALINA_USER}:${CATALINA_GROUP} \
--make-pidfile --pidfile /var/run/tomcat-7.pid \
--exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
return $?