diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start b/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start index 189c02021d..b7ae09a4f7 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start +++ b/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start @@ -34,7 +34,7 @@ install_db () { [ -d "$datadir/mysql" ] && exit 0 # Create initial db - /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql + /usr/bin/mariadb-install-db --rpm --datadir="$datadir" --user=mysql exit 0 } @@ -51,7 +51,7 @@ pinger () { while /bin/true ; do sleep 1 - mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break + mariadb-admin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break done exit 0 } diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service b/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service index d88361703d..9c47fede1c 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service +++ b/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service @@ -13,7 +13,7 @@ Group=mysql PermissionsStartOnly=true # Start main service -ExecStart=@BINDIR@/mysqld_safe --basedir=@PREFIX@ +ExecStart=@BINDIR@/mariadbd-safe --basedir=@PREFIX@ # Don't signal startup success before a ping works ExecStartPost=@BINDIR@/mysql-systemd-start post