summaryrefslogtreecommitdiffstats
path: root/satellit_upgrader
diff options
context:
space:
mode:
authorSimon Rettberg2020-02-24 16:59:09 +0100
committerSimon Rettberg2020-02-24 16:59:09 +0100
commit2f4f3bcfd6c4ce48ad29dfa4dc801bc70fb8fb3e (patch)
treeb04474935c68e3509f611237ddf99bba9b15fb22 /satellit_upgrader
parent[SSPS] dnbd3 server.conf: ignoreAllocErrors=true (diff)
downloadsetup-scripts-2f4f3bcfd6c4ce48ad29dfa4dc801bc70fb8fb3e.tar.gz
setup-scripts-2f4f3bcfd6c4ce48ad29dfa4dc801bc70fb8fb3e.tar.xz
setup-scripts-2f4f3bcfd6c4ce48ad29dfa4dc801bc70fb8fb3e.zip
[SSUS] Don't reinstall mariadb every time
The loop that uninstalls older versions didn't properly ignore the mariadb-server-core-<x> package belonging to the desired version. It only ignored mariadb-server-<x>, but uninstalling the core package would obviously also remove the whole server version we actually want.
Diffstat (limited to 'satellit_upgrader')
-rw-r--r--satellit_upgrader/updater.template.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 7a832ca..9de22c7 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -276,7 +276,7 @@ aptinst php-soap
# MySQL...
for ver in $( dpkg-query -W -f='${Package}\n' "mysql-server-*" "mariadb-server-*" ); do
- [ "$ver" = "mariadb-server-$mysql" ] && continue
+ [[ "$ver" == *"-$mysql" ]] && continue
dpkg -l "$ver" 2> /dev/null | grep -q '^ii' && apt remove -y "$ver"
done
aptinst default-mysql-server