From c51024d1cbc6f07149019d9ee445ff699d5abb14 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 27 Jan 2020 11:49:22 +0100
Subject: [SSUS] Explicitly exclude desired mariadb version from apt remove

---
 satellit_upgrader/updater.template.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 6832954..594df66 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -154,6 +154,8 @@ aptinst () {
 			pwarning "*"
 			return 1
 		fi
+	else
+		failprint apt-mark manual "$pkg"
 	fi
 	return 0
 }
@@ -240,14 +242,18 @@ if [ -f "/etc/cron.daily/tmpdelete.sh" ]; then
 	rm -f -- "/etc/cron.daily/tmpdelete.sh"
 fi
 
-# Make sure current java is installed
-if [ "$MAJOR" -le 9 ]; then
+if [ "$MAJOR" -eq 9 ]; then
 	java="7"
 	php="-1"
-else # 10+
+	mysql="10.1"
+elif [ "$MAJOR" -eq 10 ]; then
 	java="11"
 	php="2"
+	mysql="10.3"
+else
+	perror "Abort"
 fi
+# Make sure current java is installed
 for ver in $(seq 6 "$java"); do
 	dpkg -l "openjdk-${ver}-*" 2> /dev/null | grep -q '^ii' && apt remove -y "openjdk-${ver}-*"
 done
@@ -268,8 +274,11 @@ aptinst php-xml
 aptinst php-soap
 
 # MySQL...
-dpkg -l 'mysql-server*' | grep -q '^ii' && apt remove -y "mysql-server*"
-aptinst default-mysql-server && apt-mark manual default-mysql-server
+for ver in $( dpkg-query -W -f='${Package}\n' "mysql-server-*" "mariadb-server-*" ); do
+	[ "$ver" = "mariadb-server-$mysql" ] && continue
+	dpkg -l "$ver" 2> /dev/null | grep -q '^ii' && apt remove -y "$ver"
+done
+aptinst default-mysql-server
 
 # ********************** Taskmanager ***********************
 # Do this first in case one of the later updates depends on the taskmanager
-- 
cgit v1.2.3-55-g7522