You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/12 08:43:30 UTC
[19/41] git commit: debian: Update locations where to search for Java
under Ubuntu and Debian
debian: Update locations where to search for Java under Ubuntu and Debian
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0429cce9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0429cce9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0429cce9
Branch: refs/heads/4.0
Commit: 0429cce9e57e0bc7e3cb165edc61552b3593d057
Parents: 9312641
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Sep 11 15:22:17 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Tue Sep 11 15:22:17 2012 +0200
----------------------------------------------------------------------
.../ubuntu/SYSCONFDIR/init.d/cloud-management.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0429cce9/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
----------------------------------------------------------------------
diff --git a/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in b/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
index b4f2d3e..5ed86c2 100755
--- a/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
+++ b/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
@@ -60,7 +60,7 @@ TOMCAT6_USER=tomcat6
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-1.6.0-openjdk-i386/ /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
+JDK_DIRS="/usr/lib/jvm/java-1.6.0-openjdk-amd64/ /usr/lib/jvm/java-1.6.0-openjdk-i386/ /usr/lib/jvm/java-1.6.0-openjdk/ /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun"
# Look for the right JVM to use
for jdir in $JDK_DIRS; do