aboutsummaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorMichal Hrusecky <michal@hrusecky.net>2022-10-21 22:43:52 +0200
committerRosen Penev <rosenp@gmail.com>2022-10-24 11:15:36 -0700
commit8f6831b64b89243e7c1be5948f33e6737f7ddfc3 (patch)
tree1cda4a0226b343c7c732954d59a014fa9e70701a /utils
parentad515e37fd923cd66a643d5165347faa7afb5946 (diff)
mariadb: Drop unused rundir fix socket dir perms
We had been creating "rundir" but it was never used, probably leftover from some removed function. At the same time, we were setting quite strict rights to the socket directory (while comments sugested otherwise). Signed-off-by: Michal Hrusecky <michal@hrusecky.net>
Diffstat (limited to 'utils')
-rw-r--r--utils/mariadb/files/mysqld.init10
1 files changed, 3 insertions, 7 deletions
diff --git a/utils/mariadb/files/mysqld.init b/utils/mariadb/files/mysqld.init
index 8fff379e1..52def2d3c 100644
--- a/utils/mariadb/files/mysqld.init
+++ b/utils/mariadb/files/mysqld.init
@@ -67,7 +67,6 @@ mysqld_status() {
start_service() {
conf=/etc/mysql/my.cnf
logdir=/var/log/mysql
- rundir=/var/run/mysqld
version="$(mysqld --version | sed -n 's|.*Ver[[:blank:]]*\([0-9.]*\)-.*|\1|p')"
# Few basic checks
@@ -134,14 +133,11 @@ start_service() {
fi
# Make sure all required directories exists and have correct rights
- for i in "$logdir" "$rundir" "$sockdir"; do
+ for i in "$logdir" "$sockdir"; do
opts="-m 0750"
if ! [ -e "$i" ]; then
- # $rundir needs to be accessible for
- # clients
- if [ "$i" = "$rundir" ]; then
- opts=
- fi
+ # $sockdir needs to be accessible for clients
+ [ "$i" = "$sockdir" ] && opts="-m 0755"
# shellcheck disable=SC2086
mkdir -p $opts "$i"
fi