Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #17608 from miska/mariadb-owner-fix

Browse source 
Mariadb owner fix & sudo dependency
This commit is contained in:
Josef Schlehofer 2022-01-14 16:26:54 +01:00 committed by GitHub
commit c280d64f85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
utils/mariadb/Makefile
View file

@ -265,7 +265,8 @@ define Package/mariadb-server-base
+KERNEL_IO_URING:liburing \ +KERNEL_IO_URING:liburing \
+liblzma \ +liblzma \
+libpcre2 \ +libpcre2 \
+resolveip +resolveip \
+sudo
TITLE:=MariaDB database server base TITLE:=MariaDB database server base
USERID:=mariadb=376:mariadb=376 USERID:=mariadb=376:mariadb=376
endef endef

6
utils/mariadb/files/mysqld.init
View file

@ -152,6 +152,12 @@ start_service() {
# Migration from old versions # Migration from old versions
# shellcheck disable=SC2154 # shellcheck disable=SC2154
if [ "$(cat "$datadir"/.version 2> /dev/null)" \!= "$version" ] && [ "$autoupgrade" -gt 0 ]; then 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 # Start upgrade instance without credentials
sudo -u "$my_user" mysqld --skip-networking --skip-grant-tables --socket=/tmp/mysql_upgrade.sock & sudo -u "$my_user" mysqld --skip-networking --skip-grant-tables --socket=/tmp/mysql_upgrade.sock &
PID="$!" PID="$!"