diff options
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/mysqld.service | 2 |
2 files changed, 3 insertions, 3 deletions
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 () { | |||
| 34 | [ -d "$datadir/mysql" ] && exit 0 | 34 | [ -d "$datadir/mysql" ] && exit 0 |
| 35 | 35 | ||
| 36 | # Create initial db | 36 | # Create initial db |
| 37 | /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql | 37 | /usr/bin/mariadb-install-db --rpm --datadir="$datadir" --user=mysql |
| 38 | exit 0 | 38 | exit 0 |
| 39 | } | 39 | } |
| 40 | 40 | ||
| @@ -51,7 +51,7 @@ pinger () { | |||
| 51 | 51 | ||
| 52 | while /bin/true ; do | 52 | while /bin/true ; do |
| 53 | sleep 1 | 53 | sleep 1 |
| 54 | mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break | 54 | mariadb-admin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break |
| 55 | done | 55 | done |
| 56 | exit 0 | 56 | exit 0 |
| 57 | } | 57 | } |
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 | |||
| 13 | PermissionsStartOnly=true | 13 | PermissionsStartOnly=true |
| 14 | 14 | ||
| 15 | # Start main service | 15 | # Start main service |
| 16 | ExecStart=@BINDIR@/mysqld_safe --basedir=@PREFIX@ | 16 | ExecStart=@BINDIR@/mariadbd-safe --basedir=@PREFIX@ |
| 17 | 17 | ||
| 18 | # Don't signal startup success before a ping works | 18 | # Don't signal startup success before a ping works |
| 19 | ExecStartPost=@BINDIR@/mysql-systemd-start post | 19 | ExecStartPost=@BINDIR@/mysql-systemd-start post |
