RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 19:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16609 from wjwithagen/wip-wjw-FreeBSD-group-wheel

Browse Source 
ceph_disk/main.py: FreeBSD root has wheel for group

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-07-28 13:13:28 +08:00 committed by GitHub
commit b3b972c733
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ceph-disk/ceph_disk/main.py
View File

@ -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),