RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-07 18:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1961 from ceph/wip-6703

Browse Source 
support dmcrypt partitions when activating

Reviewed-by: Loic Dachary <loic@dachary.org>
This commit is contained in:
Loic Dachary 2014-06-20 19:45:58 +02:00
commit 31eefebdec
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ceph-disk
View File

@ -2091,8 +2091,14 @@ def main_activate_all(args):
if name.find('.') < 0: if name.find('.') < 0:
continue continue
(tag, uuid) = name.split('.') (tag, uuid) = name.split('.')
if tag == OSD_UUID:
if tag == OSD_UUID or tag == DMCRYPT_OSD_UUID:
if tag == DMCRYPT_OSD_UUID:
path = os.path.join('/dev/mapper', uuid)
else:
path = os.path.join(dir, name) path = os.path.join(dir, name)
LOG.info('Activating %s', path) LOG.info('Activating %s', path)
activate_lock.acquire() activate_lock.acquire()
try: try: