diff options
| -rw-r--r-- | storage/devicelibs/dm.py | 9 | ||||
| -rw-r--r-- | storage/devices.py | 2 | ||||
| -rw-r--r-- | storage/devicetree.py | 2 | ||||
| -rw-r--r-- | storage/formats/dmraid.py | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/storage/devicelibs/dm.py b/storage/devicelibs/dm.py index 74d8228de..29df1266e 100644 --- a/storage/devicelibs/dm.py +++ b/storage/devicelibs/dm.py @@ -22,6 +22,7 @@ import os +import block import iutil from ..errors import * @@ -32,6 +33,10 @@ import logging log = logging.getLogger("storage") def name_from_dm_node(dm_node): + name = block.getNameFromDmNode(dm_node) + if name is not None: + return name + st = os.stat("/dev/%s" % dm_node) major = os.major(st.st_rdev) minor = os.minor(st.st_rdev) @@ -44,6 +49,10 @@ def name_from_dm_node(dm_node): return name.strip() def dm_node_from_name(map_name): + dm_node = block.getDmNodeFromName(map_name) + if dm_node is not None: + return dm_node + devnum = iutil.execWithCapture("dmsetup", ["info", "--columns", "--noheadings", diff --git a/storage/devices.py b/storage/devices.py index b69822f62..678ed62f9 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -98,7 +98,6 @@ import math # device backend modules from devicelibs import mdraid from devicelibs import lvm -#import block from devicelibs import dm import parted import _ped @@ -1217,7 +1216,6 @@ class DMDevice(StorageDevice): raise DeviceError("device has not been created") return dm.dm_node_from_name(self.name) - #return block.getDmNodeFromName(self.name) def _setName(self, name): """ Set the device's map name. """ diff --git a/storage/devicetree.py b/storage/devicetree.py index 4729810d0..ccc925a83 100644 --- a/storage/devicetree.py +++ b/storage/devicetree.py @@ -712,7 +712,6 @@ class DeviceTree(object): for slave_name in slave_names: # if it's a dm-X name, resolve it to a map name first if slave_name.startswith("dm-"): - #slave_name = block.getNameFromDmNode(slave_name) slave_name = dm.name_from_dm_node(slave_name) slave_dev = self.getDeviceByName(slave_name) if slave_dev: @@ -766,7 +765,6 @@ class DeviceTree(object): for slave_name in slave_names: # if it's a dm-X name, resolve it to a map name if slave_name.startswith("dm-"): - #slave_name = block.getNameFromDmNode(slave_name) slave_name = dm.name_from_dm_node(slave_name) slave_dev = self.getDeviceByName(slave_name) if slave_dev: diff --git a/storage/formats/dmraid.py b/storage/formats/dmraid.py index ef80902e2..f5f28084a 100644 --- a/storage/formats/dmraid.py +++ b/storage/formats/dmraid.py @@ -23,7 +23,6 @@ import block from iutil import log_method_call -#from dm import dm_node_from_name from ..errors import * from . import DeviceFormat, register_device_format |