mariadb-galera: upgrade

1 files changed, 7 insertions, 23 deletions

diff --git a/pcr/mariadb-galera/mariadb.install b/pcr/mariadb-galera/mariadb.install
index 68bcc14e4..1ca233beb 100644
--- a/pcr/mariadb-galera/mariadb.install
+++ b/pcr/mariadb-galera/mariadb.install
@@ -1,17 +1,10 @@
-if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then
-  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
-fi
-[[ -z $datadir ]] && datadir=/var/lib/mysql
-
 post_install(){
   groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
 
-  if [[ ! -e $datadir ]]; then
-    install -dm700 $datadir
-    usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
-    chown -R mysql:mysql var/lib/mysql &>/dev/null
-  fi
+  echo ":: You need to initialize the MariaDB data directory prior to starting"
+  echo "   the service. This can be done with mysql_install_db command, e.g.:"
+  echo "   mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
 
   usr/bin/systemd-tmpfiles --create mysql.conf
 
@@ -23,11 +16,12 @@ https://mariadb.com/kb/en/mariadb/documentation/replication/galera/getting-start
 
 post_upgrade(){
   getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql \
+    -s /bin/false mysql &>/dev/null
 
   if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
     for x in data/*; do
-      cp -r $x $datadir/
+      cp -r $x var/lib/mysql
     done
     rm -rf data
   fi
@@ -42,13 +36,3 @@ post_upgrade(){
     echo "   running mysql_upgrade afterwards."
   fi
 }
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}