mcst-linux-kernel/patches-2024.06.26/ceph-14.2.22/0010-fix-var-run-ceph-acces...

31 lines
991 B
Diff

Link: https://github.com/ceph/ceph/pull/43305
Subject: fix /var/run/ceph access rights
Bug: 135791
Tags: common
diff -rupN a/src/init-ceph.in b/src/init-ceph.in
--- a/src/init-ceph.in 2021-09-23 18:07:15.198314513 +0300
+++ b/src/init-ceph.in 2021-09-23 18:07:27.565281315 +0300
@@ -298,6 +298,10 @@ for name in $what; do
get_conf pid_file "$run_dir/$type.$id.pid" "pid file"
+ if [ ! -d $run_dir ]; then
+ install -d -m0770 -o ceph -g ceph /var/run/ceph
+ fi
+
if [ "$command" = "start" -o "$command" = "onestart" ]; then
if [ -n "$pid_file" ]; then
do_cmd "mkdir -p "`dirname $pid_file`
@@ -426,10 +430,6 @@ for name in $what; do
fi
echo Starting Ceph $name on $host...
- if [ ! -d $run_dir ]; then
- # assume /var/run exists
- install -d -m0770 -o ceph -g ceph /var/run/ceph
- fi
get_conf pre_start_eval "" "pre start eval"
[ -n "$pre_start_eval" ] && $pre_start_eval
get_conf pre_start "" "pre start command"