diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2007-01-08 22:44:55 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2007-01-08 22:44:55 +0000 |
| commit | 6df178ba8bb65db96ebf96e59b59fb1621458ae8 (patch) | |
| tree | c6f7f4c79c159a9e69dc533fc74048e4ab37768d /www-servers | |
| parent | Stable on Alpha + IA64, bug 159508. (diff) | |
| download | gentoo-2-6df178ba8bb65db96ebf96e59b59fb1621458ae8.tar.gz gentoo-2-6df178ba8bb65db96ebf96e59b59fb1621458ae8.tar.bz2 gentoo-2-6df178ba8bb65db96ebf96e59b59fb1621458ae8.zip | |
Fix init.d script for bug #149460 (empty GENTOO_VM).
(Portage version: 2.1.2_rc4-r7)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/resin/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/resin/files/3.0.22/resin.init | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog index 87c91ab78aff..51d9a90cead1 100644 --- a/www-servers/resin/ChangeLog +++ b/www-servers/resin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/resin # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.32 2007/01/02 22:33:47 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.33 2007/01/08 22:44:55 nelchael Exp $ + + 08 Jan 2007; Krzysiek Pawlik <nelchael@gentoo.org> + files/3.0.22/resin.init: + Fix init.d script for bug #149460 (empty GENTOO_VM). 02 Jan 2007; Krzysiek Pawlik <nelchael@gentoo.org> files/3.1.0/resin.conf, files/3.1.0/resin.init: diff --git a/www-servers/resin/files/3.0.22/resin.init b/www-servers/resin/files/3.0.22/resin.init index 6a66fb947c5a..075eb2e40e5b 100644 --- a/www-servers/resin/files/3.0.22/resin.init +++ b/www-servers/resin/files/3.0.22/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.0.22/resin.init,v 1.1 2006/11/19 12:23:22 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.0.22/resin.init,v 1.2 2007/01/08 22:44:55 nelchael Exp $ depend() { need net @@ -9,14 +9,18 @@ depend() { } start() { - export JAVA_HOME=$(java-config --select-vm=${GENTOO_VM} -O) + JAVA_HOME=$(java-config -O) + [[ -n "${GENTOO_VM}" ]] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) + export JAVA_HOME ebegin "Starting Resin" su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ -java_home ${JAVA_HOME} -resin_home ${RESIN_HOME} -cp ${CLASSPATH} -stdout ${RESIN_OUT} -stderr ${RESIN_ERR} ${RESIN_START}" eend $? } stop() { - export JAVA_HOME=$(java-config --select-vm=${GENTOO_VM} -O) + JAVA_HOME=$(java-config -O) + [[ -n "${GENTOO_VM}" ]] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) + export JAVA_HOME ebegin "Stopping Resin" su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ ${RESIN_STOP}" eend $? |