diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index a0d1fa84b..31c61a42e 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -265,7 +265,8 @@ define Package/mariadb-server-base +KERNEL_IO_URING:liburing \ +liblzma \ +libpcre2 \ - +resolveip + +resolveip \ + +sudo TITLE:=MariaDB database server base USERID:=mariadb=376:mariadb=376 endef diff --git a/utils/mariadb/files/mysqld.init b/utils/mariadb/files/mysqld.init index f20697161..8fff379e1 100644 --- a/utils/mariadb/files/mysqld.init +++ b/utils/mariadb/files/mysqld.init @@ -152,6 +152,12 @@ start_service() { # Migration from old versions # shellcheck disable=SC2154 if [ "$(cat "$datadir"/.version 2> /dev/null)" \!= "$version" ] && [ "$autoupgrade" -gt 0 ]; then + # Check for correct owner + local owner="$(stat --format %U:%G "$datadir" 2> /dev/null)" + if [ -n "$owner" ] && [ "$owner" != "$my_user:$my_group" ]; then + chown -Rh "$my_user:$my_group" "$datadir" + fi + # Start upgrade instance without credentials sudo -u "$my_user" mysqld --skip-networking --skip-grant-tables --socket=/tmp/mysql_upgrade.sock & PID="$!"