summaryrefslogtreecommitdiffstats
path: root/storage/devicetree.py
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2009-07-31 16:32:37 +0200
committerHans de Goede <hdegoede@redhat.com>2009-08-04 10:56:32 +0200
commit18dce332e9b77fd13b0d7e0b7c3e5e398753a423 (patch)
tree11e22d93dc46aa50998d1ed1d65284ea07c1be46 /storage/devicetree.py
parent1a42b9203412cab698fe8cc665918592b7121579 (diff)
downloadanaconda-18dce332e9b77fd13b0d7e0b7c3e5e398753a423.tar.gz
anaconda-18dce332e9b77fd13b0d7e0b7c3e5e398753a423.tar.xz
anaconda-18dce332e9b77fd13b0d7e0b7c3e5e398753a423.zip
Store iscsi node pointer in iScsiDiskDevice objects
This is a preparation patch for adding support for writing the necessary dracut cmndline options to grub.conf
Diffstat (limited to 'storage/devicetree.py')
-rw-r--r--storage/devicetree.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/devicetree.py b/storage/devicetree.py
index 71d7a4830..b4634d958 100644
--- a/storage/devicetree.py
+++ b/storage/devicetree.py
@@ -203,7 +203,7 @@ class DeviceTree(object):
def __init__(self, intf=None, ignored=[], exclusive=[], type=CLEARPART_TYPE_NONE,
clear=[], zeroMbr=None, reinitializeDisks=None, protected=[],
- passphrase=None, luksDict=None):
+ passphrase=None, luksDict=None, iscsi=None):
# internal data members
self._devices = []
self._actions = []
@@ -217,6 +217,7 @@ class DeviceTree(object):
self.clearPartDisks = clear
self.zeroMbr = zeroMbr
self.reinitializeDisks = reinitializeDisks
+ self.iscsi = iscsi
# protected device specs as provided by the user
self.protectedDevSpecs = protected
@@ -1105,9 +1106,10 @@ class DeviceTree(object):
kwargs = {}
if udev_device_is_iscsi(info):
diskType = iScsiDiskDevice
- kwargs["iscsi_name"] = udev_device_get_iscsi_name(info)
- kwargs["iscsi_address"] = udev_device_get_iscsi_address(info)
- kwargs["iscsi_port"] = udev_device_get_iscsi_port(info)
+ kwargs["node"] = self.iscsi.getNode(
+ udev_device_get_iscsi_name(info),
+ udev_device_get_iscsi_address(info),
+ udev_device_get_iscsi_port(info))
log.debug("%s is an iscsi disk" % name)
elif udev_device_is_fcoe(info):
diskType = FcoeDiskDevice