Skip to content

Commit d668356

Browse files
committed
check virtual device mount path after proper resolution
Signed-off-by: Zen <[email protected]>
1 parent ae8fb23 commit d668356

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/ugrd/fs/mounts.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,6 @@ def _autodetect_dm(self, mountpoint, device=None) -> None:
326326
else:
327327
raise FileNotFoundError("Mountpoint not found in host mounts: %s" % mountpoint)
328328

329-
if not any(source_device.startswith(prefix) for prefix in ['/dev/mapper', '/dev/dm-', '/dev/md']):
330-
self.logger.debug("Mount is not a device mapper mount: %s" % source_device)
331-
return
332-
333329
device_name = source_device.split('/')[-1]
334330
if source_device not in self['_blkid_info']:
335331
if device_name in self['_dm_info']:
@@ -342,6 +338,10 @@ def _autodetect_dm(self, mountpoint, device=None) -> None:
342338
else:
343339
raise ValueError("[%s] No blkid info for virtual device: %s" % (mountpoint, source_device))
344340

341+
if not any(source_device.startswith(prefix) for prefix in ['/dev/mapper', '/dev/dm-', '/dev/md']):
342+
self.logger.debug("Mount is not a device mapper mount: %s" % source_device)
343+
return
344+
345345
self.logger.info("[%s] Detected virtual block device: %s" % (mountpoint, source_device))
346346
source_device = Path(source_device)
347347
major, minor = _get_device_id(source_device)

0 commit comments

Comments
 (0)