Skip to content

Commit 228d94f

Browse files
committed
warn when a virtual block device has no name
Signed-off-by: Zen <[email protected]>
1 parent a41bacb commit 228d94f

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/ugrd/fs/mounts.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
__author__ = 'desultory'
2-
__version__ = '4.15.3'
2+
__version__ = '4.15.4'
33

44
from pathlib import Path
55
from zenlib.util import contains, pretty_print
@@ -277,12 +277,16 @@ def get_dm_info(self) -> dict:
277277
for dm_device in (Path('/sys/devices/virtual/block').iterdir()):
278278
if dm_device.name.startswith('dm-') or dm_device.name.startswith('md'):
279279
maj, minor = (dm_device / 'dev').read_text().strip().split(':')
280-
self['_dm_info'][dm_device.name] = {'name': (dm_device / 'dm/name').read_text().strip(),
281-
'major': maj,
280+
self['_dm_info'][dm_device.name] = {'major': maj,
282281
'minor': minor,
283282
'holders': [holder.name for holder in (dm_device / 'holders').iterdir()],
284283
'slaves': [slave.name for slave in (dm_device / 'slaves').iterdir()],
285284
'uuid': (dm_device / 'dm/uuid').read_text().strip()}
285+
try:
286+
self['_dm_info'][dm_device.name]['name'] = (dm_device / 'dm/name').read_text().strip()
287+
except FileNotFoundError:
288+
self.logger.warning("No device mapper name found for: %s" % dm_device.name)
289+
286290
if self['_dm_info']:
287291
self.logger.info("Found device mapper devices: %s" % ', '.join(self['_dm_info'].keys()))
288292
self.logger.debug("Device mapper info: %s" % pretty_print(self['_dm_info']))

0 commit comments

Comments
 (0)