From: Shawn Edwards <shedwards@nvidia.com>
Date: Tue, 25 Mar 2025 19:44:40 +0000 (+0000)
Subject: Use system-defined location for home directories
X-Git-Tag: testing/wip-vshankar-testing-20250521.043110-debug~6^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c5a316cfd5e993ad5accd12ed101dc33ff671163;p=ceph-ci.git

Use system-defined location for home directories

This patch removes the assumption that user home directories always live under /home. If the user has set home directories to live under a different directory by changing /etc/adduser.conf, this will honor that setting.

Signed-off-by: Shawn Edwards <shedwards@nvidia.com>
---

diff --git a/debian/cephadm.postinst b/debian/cephadm.postinst
index 50aa6f8dd51..87a0d81e22c 100644
--- a/debian/cephadm.postinst
+++ b/debian/cephadm.postinst
@@ -28,7 +28,6 @@ case "$1" in
          adduser --quiet \
                  --system \
                  --disabled-password \
-                 --home /home/cephadm \
                  --shell /bin/bash cephadm 2>/dev/null || true
          usermod --comment "cephadm user for mgr/cephadm" cephadm
          echo "..done"
@@ -42,15 +41,15 @@ case "$1" in
        fi
 
        # set up (initially empty) .ssh/authorized_keys file
-       if ! test -d /home/cephadm/.ssh; then
-           mkdir /home/cephadm/.ssh
-           chown --reference /home/cephadm /home/cephadm/.ssh
-           chmod 0700 /home/cephadm/.ssh
+       if ! test -d ~cephadm/.ssh; then
+           mkdir ~cephadm/.ssh
+           chown --reference ~cephadm ~cephadm/.ssh
+           chmod 0700 ~cephadm/.ssh
        fi
-       if ! test -e /home/cephadm/.ssh/authorized_keys; then
-           touch /home/cephadm/.ssh/authorized_keys
-           chown --reference /home/cephadm /home/cephadm/.ssh/authorized_keys
-           chmod 0600 /home/cephadm/.ssh/authorized_keys
+       if ! test -e ~cephadm/.ssh/authorized_keys; then
+           touch ~cephadm/.ssh/authorized_keys
+           chown --reference ~cephadm ~cephadm/.ssh/authorized_keys
+           chmod 0600 ~cephadm/.ssh/authorized_keys
        fi
 
     ;;