From d40256d4f1f0db0be2acd802061c49e7f835521a Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Wed, 26 Jul 2017 18:21:19 +0200 Subject: [PATCH] src/ceph-disk/ceph_disk/main.py: FreeBSD root has wheel for group Signed-off-by: Willem Jan Withagen --- src/ceph-disk/ceph_disk/main.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py index f427123c29280..5ae5840b6ac89 100755 --- a/src/ceph-disk/ceph_disk/main.py +++ b/src/ceph-disk/ceph_disk/main.py @@ -215,11 +215,13 @@ if platform.system() == 'FreeBSD': PROCDIR = '/compat/linux/proc' # FreeBSD does not have blockdevices any more BLOCKDIR = '/dev' + ROOTGROUP = 'wheel' else: FREEBSD = False DEFAULT_FS_TYPE = 'xfs' PROCDIR = '/proc' BLOCKDIR = '/sys/block' + ROOTGROUP = 'root' """ OSD STATUS Definition @@ -4857,11 +4859,11 @@ def main_trigger(args): def main_fix(args): # A hash table containing 'path': ('uid', 'gid', blocking, recursive) fix_table = [ - ('/usr/bin/ceph-mon', 'root', 'root', True, False), - ('/usr/bin/ceph-mds', 'root', 'root', True, False), - ('/usr/bin/ceph-osd', 'root', 'root', True, False), - ('/usr/bin/radosgw', 'root', 'root', True, False), - ('/etc/ceph', 'root', 'root', True, True), + ('/usr/bin/ceph-mon', 'root', ROOTGROUP, True, False), + ('/usr/bin/ceph-mds', 'root', ROOTGROUP, True, False), + ('/usr/bin/ceph-osd', 'root', ROOTGROUP, True, False), + ('/usr/bin/radosgw', 'root', ROOTGROUP, True, False), + ('/etc/ceph', 'root', ROOTGROUP, True, True), ('/var/run/ceph', 'ceph', 'ceph', True, True), ('/var/log/ceph', 'ceph', 'ceph', True, True), ('/var/log/radosgw', 'ceph', 'ceph', True, True), -- 2.39.5