From 9d8436f922ad2d4ee7edb647e2e1677c2194ad61 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Wed, 21 Oct 2015 14:26:22 +0200
Subject: [PATCH] Avoid repetition of JVM_OPTS in debian package

patch by urandom; reviewed by mshuler for CASSANDRA-8821
---
 CHANGES.txt |  1 +
 debian/init | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2a28a86ceb..31ae1c0ced 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-8821)
  * Fix potential NPE from handling result of SIM.highestSelectivityIndex (CASSANDRA-10550)
  * Fix paging issues with partitions containing only static columns data
    (CASSANDRA-10381)
diff --git a/debian/init b/debian/init
index 56f2523bde..aff54e1c7a 100644
--- a/debian/init
+++ b/debian/init
@@ -30,16 +30,6 @@ FD_LIMIT=100000
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
-# Read Cassandra environment file.
-. /etc/cassandra/cassandra-env.sh
-
-if [ -z "$JVM_OPTS" ]; then
-    echo "Initialization failed; \$JVM_OPTS not set!" >&2
-    exit 3
-fi
-
-export JVM_OPTS
-
 # Export JAVA_HOME, if set.
 [ -n "$JAVA_HOME" ] && export JAVA_HOME