From a26c70a004b24d9385a13d7b9e3f3f1295e5e1c2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 18 Mar 2019 10:39:59 +0100
Subject: [SSPS/SSUS] Disable java accessibility helper

---
 satellit_installer/includes/90-patch_misc_files.inc | 5 +++++
 satellit_installer/satellit_installer               | 2 ++
 satellit_upgrader/updater.template.sh               | 6 ++++++
 3 files changed, 13 insertions(+)

diff --git a/satellit_installer/includes/90-patch_misc_files.inc b/satellit_installer/includes/90-patch_misc_files.inc
index 1edf931..bbb3895 100644
--- a/satellit_installer/includes/90-patch_misc_files.inc
+++ b/satellit_installer/includes/90-patch_misc_files.inc
@@ -34,3 +34,8 @@ patch_ldapsearch() {
 	echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
 }
 
+patch_java() {
+	# Fix svg renderer:
+	# java.awt.AWTError: Assistive Technology not found: org.GNOME.Accessibility.AtkWrapper
+	sed -i -e '/^assistive_technologies=/s/^/#/' /etc/java-*-openjdk/accessibility.properties &> /dev/null
+}
diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer
index 84f131a..b252d6b 100755
--- a/satellit_installer/satellit_installer
+++ b/satellit_installer/satellit_installer
@@ -135,6 +135,8 @@ write_tmate_config			# here or elsewhere...
 
 patch_ldapsearch
 
+patch_java
+
 write_apt_config
 
 install_bwSuite_server "$DMSDDIR"
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 4d70f2b..7a3322a 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -697,6 +697,12 @@ count=0
 	[ "$count" -gt 7 ] && break
 done
 
+# ************************** Misc stuff ********************
+# This fixes kitfox svg, namely this exception you'd get with
+# the headless openjdk install:
+# java.awt.AWTError: Assistive Technology not found: org.GNOME.Accessibility.AtkWrapper
+sed -i -e '/^assistive_technologies=/s/^/#/' /etc/java-*-openjdk/accessibility.properties &> /dev/null
+
 # ************************** LIGHTY ************************
 if [ -n "$RESTART_LIGHTY" ]; then
 	count=0
-- 
cgit v1.2.3-55-g7522