From: Sage Weil <sage@redhat.com>
Date: Sat, 23 Nov 2019 15:07:09 +0000 (-0600)
Subject: ceph-daemon: fix extract_uid_gid
X-Git-Tag: v15.1.0~785^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31832%2Fhead;p=ceph.git

ceph-daemon: fix extract_uid_gid

This will get confused by the cephdaemon user!

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon
index 9e4216f3b3d1c..820c394013ed4 100755
--- a/src/ceph-daemon/ceph-daemon
+++ b/src/ceph-daemon/ceph-daemon
@@ -507,7 +507,7 @@ def extract_uid_gid():
     out = CephContainer(
         image=args.image,
         entrypoint='/usr/bin/grep',
-        args=['ceph', '/etc/passwd'],
+        args=['^ceph:', '/etc/passwd'],
     ).run()
     (uid, gid) = out.split(':')[2:4]
     return (int(uid), int(gid))