]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rpm: unconditionally set ceph user's primary group to ceph (SUSE) 9424/head
authorNathan Cutler <ncutler@suse.com>
Thu, 12 May 2016 17:23:31 +0000 (19:23 +0200)
committerNathan Cutler <ncutler@suse.com>
Wed, 1 Jun 2016 16:28:31 +0000 (18:28 +0200)
This commit brings the user/group creation into greater semantic alignment
with the Debian packaging.

Fixes: http://tracker.ceph.com/issues/15869
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit b3dfa8d90962e60b6841555db830c8ea635f4cce)

ceph.spec.in

index 34e4caa71bde97f3d64d422f37f361d8b35c1b07..edfd71c170f5e99e93d3dc4018ab4ff43d6d8a49 100644 (file)
@@ -1006,8 +1006,13 @@ fi
 if ! getent passwd ceph >/dev/null ; then
     CEPH_USER_ID_OPTION=""
     getent passwd $CEPH_USER_ID >/dev/null || CEPH_USER_ID_OPTION="-u $CEPH_USER_ID"
-    useradd ceph $CEPH_USER_ID_OPTION -r -g ceph -s /sbin/nologin -c "Ceph daemons" -d %{_localstatedir}/lib/ceph 2>/dev/null || :
+    useradd ceph $CEPH_USER_ID_OPTION -r -g ceph -s /sbin/nologin 2>/dev/null || :
 fi
+usermod -c "Ceph storage service" \
+        -d %{_localstatedir}/lib/ceph \   
+        -g ceph \
+        -s /sbin/nologin \
+        ceph
 %endif
 exit 0