1 files changed, 10 insertions, 1 deletions
diff --git a/community/mariadb/mariadb.install b/community/mariadb/mariadb.install
index 9a4479215..c9cc75b47 100644
--- a/community/mariadb/mariadb.install
+++ b/community/mariadb/mariadb.install
@@ -1,7 +1,7 @@
 post_install(){
   groupadd -g 89 mysql &>/dev/null
   useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  usr/bin/mysql_install_db --user=mysql --basedir=/usr
+  /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
   chown -R mysql:mysql var/lib/mysql &>/dev/null
 }
 
@@ -14,6 +14,13 @@ post_upgrade(){
     echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
     echo " >> "
   fi
+
+  if [ "$(vercmp $2 5.5.25-4)" -lt 0 ] && [ -d /data ]; then
+    for x in /data/*; do
+      cp -r $x /var/lib/mysql/
+    done
+    rm -rf /data
+  fi
 }
 
 post_remove(){
@@ -24,3 +31,5 @@ post_remove(){
     groupdel mysql
   fi
 }
+
+# vim:set ts=2 sw=2 et: