mirror of
https://git.proxmox.com/git/ceph.git
synced 2025-04-28 15:01:36 +00:00
b37e61006f
with a cycle through `git am -3 ...` in the upstream repo, `rm *.patch` here, and `git format-patch --zero-commit --no-signature --diff-algorithm=myers --no-numbered -o ...` in the upstream repo again. Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Max Carrara <m.carrara@proxmox.com>
|
|
Date: Thu, 1 Feb 2024 18:43:36 +0100
|
|
Subject: [PATCH] debian: recursively adjust permissions of /var/lib/ceph/crash
|
|
|
|
A rather recent PR made ceph-crash run as "ceph" user instead of
|
|
root [0]. However, because /var/lib/ceph/crash/posted belongs to root,
|
|
ceph-crash cannot actually post any crash logs now.
|
|
|
|
This commit fixes this by recursively updating the permissions of
|
|
'/var/lib/ceph/crash', which ensures that all files and directories
|
|
used by 'ceph-crash.service' are actually owned by the user configured
|
|
for Ceph.
|
|
|
|
The previously existing loop has also been replaced by an invocation
|
|
of `find | xargs`.
|
|
|
|
[0]: https://github.com/ceph/ceph/pull/48713
|
|
|
|
Signed-off-by: Max Carrara <m.carrara@proxmox.com>
|
|
---
|
|
debian/ceph-base.postinst | 16 +++++++++-------
|
|
1 file changed, 9 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/debian/ceph-base.postinst b/debian/ceph-base.postinst
|
|
index 75eeb59c624..424c2c889d5 100644
|
|
--- a/debian/ceph-base.postinst
|
|
+++ b/debian/ceph-base.postinst
|
|
@@ -33,13 +33,15 @@ case "$1" in
|
|
rm -f /etc/init/ceph.conf
|
|
[ -x /sbin/start ] && start ceph-all || :
|
|
|
|
- # adjust file and directory permissions
|
|
- for DIR in /var/lib/ceph/* ; do
|
|
- if ! dpkg-statoverride --list $DIR >/dev/null
|
|
- then
|
|
- chown $SERVER_USER:$SERVER_GROUP $DIR
|
|
- fi
|
|
- done
|
|
+ PERM_COMMAND="dpkg-statoverride --list '{}' > /dev/null || chown ${SERVER_USER}:${SERVER_GROUP} '{}'"
|
|
+
|
|
+ # adjust file and directory permissions
|
|
+ find /var/lib/ceph -mindepth 1 -maxdepth 1 -print0 \
|
|
+ | xargs -0 -I '{}' sh -c "${PERM_COMMAND}"
|
|
+
|
|
+ # adjust permissions so ceph-crash.service can post reports
|
|
+ find /var/lib/ceph/crash -print0 \
|
|
+ | xargs -0 -I '{}' sh -c "${PERM_COMMAND}"
|
|
;;
|
|
abort-upgrade|abort-remove|abort-deconfigure)
|
|
:
|