Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

storage: fix search_pool_containing_dir()

Browse Source 
Canonicalize both directories, resolving symlink components. Compare
with commonpath() instead of startswith(), because /foo doesn't contain
/foobar.
This commit is contained in:
Rusty Bird 2018-09-11 23:50:21 +00:00
parent f0ee73e63f
commit d33bd3f2b6
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qubes/storage/__init__.py
View File

@ -884,17 +884,21 @@ def search_pool_containing_dir(pools, dir_path):
This is useful for implementing Pool.included_in method This is useful for implementing Pool.included_in method
''' '''
real_dir_path = os.path.realpath(dir_path)
# prefer filesystem pools # prefer filesystem pools
for pool in pools: for pool in pools:
if hasattr(pool, 'dir_path'): if hasattr(pool, 'dir_path'):
if dir_path.startswith(pool.dir_path): pool_real_dir_path = os.path.realpath(pool.dir_path)
if os.path.commonpath([pool_real_dir_path, real_dir_path]) == \
pool_real_dir_path:
return pool return pool
# then look for lvm # then look for lvm
for pool in pools: for pool in pools:
if hasattr(pool, 'thin_pool') and hasattr(pool, 'volume_group'): if hasattr(pool, 'thin_pool') and hasattr(pool, 'volume_group'):
if (pool.volume_group, pool.thin_pool) == \ if (pool.volume_group, pool.thin_pool) == \
DirectoryThinPool.thin_pool(dir_path): DirectoryThinPool.thin_pool(real_dir_path):
return pool return pool
return None return None