From: windgmbh <49904312+windgmbh@users.noreply.github.com>
Date: Wed, 3 Nov 2021 17:16:53 +0000 (+0100)
Subject: Fix sysctl.d location FHS compliance
X-Git-Tag: v18.0.0~1069^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77afa812ea8b7e1e802246e4aa3a31e7b644a502;p=ceph.git

Fix sysctl.d location FHS compliance
This fixes #53130
Containers should not write to '/usr/lib'.
That location could be read-only or overwritten.
Signed-off-by: Lukas Mayer <lmayer@wind.gmbh>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 180d06e3b0e9..fe0d7d75c901 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -62,7 +62,7 @@ DATA_DIR = '/var/lib/ceph'
 LOG_DIR = '/var/log/ceph'
 LOCK_DIR = '/run/cephadm'
 LOGROTATE_DIR = '/etc/logrotate.d'
-SYSCTL_DIR = '/usr/lib/sysctl.d'
+SYSCTL_DIR = '/etc/sysctl.d'
 UNIT_DIR = '/etc/systemd/system'
 LOG_DIR_MODE = 0o770
 DATA_DIR_MODE = 0o700