From 891d4579584216d7b383a1011feb24279b62829d Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Fri, 2 Aug 2024 14:17:58 +0200
Subject: [PATCH] Do not run the locate-java.sh script.

---
 templates/tomcat-start.sh.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/tomcat-start.sh.j2 b/templates/tomcat-start.sh.j2
index 8038dd7..59e3b11 100644
--- a/templates/tomcat-start.sh.j2
+++ b/templates/tomcat-start.sh.j2
@@ -8,8 +8,8 @@ set -e
 # Load the service settings
 . /etc/default/tomcat-instance-{{ item.http_port }}
 
-# Find the Java runtime and set JAVA_HOME
-. /usr/libexec/tomcat{{ tomcat_version }}/tomcat-locate-java.sh
+# We set JAVA_HOME in /etc/default/tomcat-instance-{{ item.http_port }}
+# . /usr/libexec/tomcat{{ tomcat_version }}/tomcat-locate-java.sh
 
 # Set the JSP compiler if configured in the /etc/default/tomcat10 file
 [ -n "$JSP_COMPILER" ] && JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=\"$JSP_COMPILER\""