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

Merge pull request #12275 from micmac1/mar19run

Browse source 
[19.07] mariadb: use default umask for rundir
This commit is contained in:
Rosen Penev 2020-05-24 03:55:11 -07:00 committed by GitHub
commit 673e76b1ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/mariadb/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mariadb PKG_NAME:=mariadb
PKG_VERSION:=10.2.32 PKG_VERSION:=10.2.32
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL := \ PKG_SOURCE_URL := \

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

@ -110,27 +110,31 @@ start_service() {
-v group="$group" \ -v group="$group" \
-v a="$datadir" \ -v a="$datadir" \
-v b="$logdir" \ -v b="$logdir" \
-v c="$rundir" \ -v c="$tmpdir" \
-v d="$tmpdir" \
' '
BEGIN { BEGIN {
dir[0]=a dir[0]=a
dir[1]=b dir[1]=b
dir[2]=c dir[2]=c
dir[3]=d
for (x in dir) { for (x in dir) {
if (system("test ! -e \"" dir[x] "\"" )) { if (system("test ! -e \"" dir[x] "\"" )) {
delete dir[x] delete dir[x]
} }
} }
for (x in dir) { for (x in dir) {
system("mkdir -p \"" dir[x] "\"" ) system("mkdir -p -m 0750 \"" dir[x] "\"" )
system("chmod 750 \"" dir[x] "\"" )
system("chown \"" user "\":\"" group "\" \"" dir[x] "\"" ) system("chown \"" user "\":\"" group "\" \"" dir[x] "\"" )
} }
} }
' '
if ! [ -e "$rundir" ]; then
# $rundir needs to be accessible for
# clients
mkdir -p "$rundir"
[ -d "$rundir" ] && chown "$user":"$group" "$rundir"
fi
if [ ! -f "$datadir/mysql/tables_priv.MYD" ]; then if [ ! -f "$datadir/mysql/tables_priv.MYD" ]; then
local args="--force" local args="--force"
local basedir=$(mysqld_get_param basedir) local basedir=$(mysqld_get_param basedir)