summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2007-05-18 13:10:16 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2007-05-18 13:10:16 +0000
commitc3d2748416edb95c13b3d6df2fc599e939ce236b (patch)
treeb693a7a866f13b300c5152b7a1a14f31394e381b /www-servers/resin/files
parentStable on sparc wrt #178983 (diff)
downloadgentoo-2-c3d2748416edb95c13b3d6df2fc599e939ce236b.tar.gz
gentoo-2-c3d2748416edb95c13b3d6df2fc599e939ce236b.tar.bz2
gentoo-2-c3d2748416edb95c13b3d6df2fc599e939ce236b.zip
Fix starting of resin (bug #178149).
(Portage version: 2.1.2.7)
Diffstat (limited to 'www-servers/resin/files')
-rw-r--r--www-servers/resin/files/3.1.1/resin.conf4
-rw-r--r--www-servers/resin/files/3.1.1/resin.init9
2 files changed, 9 insertions, 4 deletions
diff --git a/www-servers/resin/files/3.1.1/resin.conf b/www-servers/resin/files/3.1.1/resin.conf
index 5fb064e1ba6c..0895ad30fbf4 100644
--- a/www-servers/resin/files/3.1.1/resin.conf
+++ b/www-servers/resin/files/3.1.1/resin.conf
@@ -8,5 +8,5 @@
# java-config -L
#GENTOO_VM=sun-jdk-1.5
-# The CLASSPATH for Resin to use, plus any others you need.
-CLASSPATH="$(java-config -p resin)"
+# Verbose starting and stopping? (yes/no, defaults to no)
+#VERBOSE="yes"
diff --git a/www-servers/resin/files/3.1.1/resin.init b/www-servers/resin/files/3.1.1/resin.init
index b8513dbe7e47..7863a112a7ba 100644
--- a/www-servers/resin/files/3.1.1/resin.init
+++ b/www-servers/resin/files/3.1.1/resin.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/resin/files/3.1.1/resin.init,v 1.1 2007/05/15 16:36:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.1/resin.init,v 1.2 2007/05/18 13:10:16 nelchael Exp $
depend() {
need net
@@ -14,10 +14,15 @@ function runResin() {
[[ -n "${GENTOO_VM}" ]] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
export JAVA_HOME
+ local extraArgs=
+ if [[ "${VERBOSE}" = "yes" ]]; then
+ extraArgs="-verbose"
+ fi
+
local msg="${1}"
shift
- local cmdline="${JAVA_HOME}/bin/java -cp ${CLASSPATH} -jar /usr/share/resin/lib/resin.jar -resin-home /usr/lib/resin ${@}"
+ local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar ${extraArgs} -resin-home /usr/lib/resin ${@}"
ebegin "${msg}"
su - resin -c "${cmdline}"