]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
debian/cephadm.postinst: stop using adduser --gecos 55709/head
authorKefu Chai <tchaikov@gmail.com>
Sat, 3 Feb 2024 05:46:05 +0000 (13:46 +0800)
committerMatthew Vernon <mvernon@wikimedia.org>
Thu, 22 Feb 2024 10:06:29 +0000 (10:06 +0000)
--gecos option of adduser is deprecated in debian/bookworm, and
will be removed in debian/trixie,
see https://manpages.debian.org/bookworm/adduser/adduser.8.en.html.
so to be future-proof, let's switch to `usermod --comment`. please
note, since we still need to support ubuntu/jammy which is used in
our CI, and `adduser` shipped by ubuntu/jammy does not support
`--comment` yet, so we cannot use this option.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit e74ec0b27dfb480a2951f85bf00072e95d944772)

debian/cephadm.postinst

index 274b7f7846a6906503f88f2202e70b5ed7a8d45e..50aa6f8dd5106e594b2a873200c112bf24cce74d 100644 (file)
@@ -29,8 +29,8 @@ case "$1" in
                  --system \
                  --disabled-password \
                  --home /home/cephadm \
-                 --gecos 'cephadm user for mgr/cephadm' \
                  --shell /bin/bash cephadm 2>/dev/null || true
+         usermod --comment "cephadm user for mgr/cephadm" cephadm
          echo "..done"
        fi