Don't search jdk6-specific paths in debian init Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6396
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85668c5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85668c5f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85668c5f Branch: refs/heads/cassandra-2.0 Commit: 85668c5f37198077e164ae6cdc8970ec9b334da9 Parents: 92fe8c8 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Nov 22 12:01:24 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Nov 22 12:01:24 2013 -0600 ---------------------------------------------------------------------- debian/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/85668c5f/debian/init ---------------------------------------------------------------------- diff --git a/debian/init b/debian/init index 99a4d83..f77a641 100644 --- a/debian/init +++ b/debian/init @@ -25,7 +25,7 @@ CASSANDRA_HOME=/usr/share/cassandra FD_LIMIT=100000 # The first existing directory is used for JAVA_HOME if needed. -JVM_SEARCH_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun" +JVM_SEARCH_DIRS="/usr/lib/jvm/default-java" [ -e /usr/share/cassandra/apache-cassandra.jar ] || exit 0 [ -e /etc/cassandra/cassandra.yaml ] || exit 0