diff options
Diffstat (limited to 'pyanaconda/storage/devices.py')
| -rw-r--r-- | pyanaconda/storage/devices.py | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py index 0d7e39c34..9bd6c6e12 100644 --- a/pyanaconda/storage/devices.py +++ b/pyanaconda/storage/devices.py @@ -328,8 +328,8 @@ class Device(object): return False - def dracutSetupString(self): - return "" + def dracutSetupArgs(self): + return set() @property def status(self): @@ -1940,9 +1940,8 @@ class LUKSDevice(DMCryptDevice): StorageDevice._postTeardown(self, recursive=recursive) - def dracutSetupString(self): - return "rd.luks.uuid=luks-%s" % self.slave.format.uuid - + def dracutSetupArgs(self): + return set(["rd.luks.uuid=luks-%s" % self.slave.format.uuid]) class LVMVolumeGroupDevice(DMDevice): """ An LVM Volume Group @@ -2620,10 +2619,10 @@ class LVMLogicalVolumeDevice(DMDevice): udev_settle() lvm.lvresize(self.vg.name, self._name, self.size) - def dracutSetupString(self): + def dracutSetupArgs(self): # Note no mapName usage here, this is a lvm cmdline name, which # is different (ofcourse) - return "rd.lvm.lv=%s/%s" % (self.vg.name, self._name) + return set(["rd.lvm.lv=%s/%s" % (self.vg.name, self._name)]) def checkSize(self): """ Check to make sure the size of the device is allowed by the @@ -3103,9 +3102,8 @@ class MDRaidArrayDevice(StorageDevice): def isDisk(self): return self.type == "mdbiosraidarray" - def dracutSetupString(self): - return "rd.md.uuid=%s" % self.uuid - + def dracutSetupArgs(self): + return set(["rd.md.uuid=%s" % self.uuid]) class DMRaidArrayDevice(DMDevice): """ A dmraid (device-mapper RAID) device """ @@ -3213,8 +3211,8 @@ class DMRaidArrayDevice(DMDevice): def model(self): return self.description - def dracutSetupString(self): - return "rd.dm.uuid=%s" % self.name + def dracutSetupArgs(self): + return set(["rd.dm.uuid=%s" % self.name]) class MultipathDevice(DMDevice): """ A multipath device """ @@ -3603,9 +3601,9 @@ class iScsiDiskDevice(DiskDevice, NetworkStorageDevice): NetworkStorageDevice.__init__(self, host_address=self.node.address) log.debug("created new iscsi disk %s %s:%d" % (self.node.name, self.node.address, self.node.port)) - def dracutSetupString(self): + def dracutSetupArgs(self): if self.ibft: - return "iscsi_firmware" + return set(["iscsi_firmware"]) address = self.node.address # surround ipv6 addresses with [] @@ -3622,9 +3620,9 @@ class iScsiDiskDevice(DiskDevice, NetworkStorageDevice): netroot += "@%s::%d::%s" % (address, self.node.port, self.node.name) - netroot += " iscsi_initiator=%s" % self.initiator + initiator = "iscsi_initiator=%s" % self.initiator - return netroot + return set([netroot, initiator]) class FcoeDiskDevice(DiskDevice, NetworkStorageDevice): """ An FCoE disk. """ @@ -3638,7 +3636,7 @@ class FcoeDiskDevice(DiskDevice, NetworkStorageDevice): NetworkStorageDevice.__init__(self, nic=self.nic) log.debug("created new fcoe disk %s @ %s" % (device, self.nic)) - def dracutSetupString(self): + def dracutSetupArgs(self): dcb = True from .fcoe import fcoe @@ -3651,7 +3649,7 @@ class FcoeDiskDevice(DiskDevice, NetworkStorageDevice): else: dcbOpt = "nodcb" - return "fcoe=edd:%s" % dcbOpt + return set(["fcoe=edd:%s" % dcbOpt]) class OpticalDevice(StorageDevice): @@ -3742,9 +3740,8 @@ class ZFCPDiskDevice(DiskDevice): 'wwpn': self.wwpn, 'lun': self.fcp_lun} - def dracutSetupString(self): - return "rd.zfcp=%s,%s,%s" % (self.hba_id, self.wwpn, self.fcp_lun,) - + def dracutSetupArgs(self): + return set(["rd.zfcp=%s,%s,%s" % (self.hba_id, self.wwpn, self.fcp_lun,)]) class DASDDevice(DiskDevice): """ A mainframe DASD. """ @@ -3766,7 +3763,7 @@ class DASDDevice(DiskDevice): def getOpts(self): return map(lambda (k, v): "%s=%s" % (k, v,), self.opts.items()) - def dracutSetupString(self): + def dracutSetupArgs(self): conf = "/etc/dasd.conf" opts = {} @@ -3782,9 +3779,9 @@ class DASDDevice(DiskDevice): opts[parts[0]] = parts if self.busid in opts.keys(): - return "rd.dasd=%s" % ",".join(opts[self.busid]) + return set(["rd.dasd=%s" % ",".join(opts[self.busid])]) else: - return "rd.dasd=%s" % ",".join([self.busid] + self.getOpts()) + return set(["rd.dasd=%s" % ",".join([self.busid] + self.getOpts())]) class NFSDevice(StorageDevice, NetworkStorageDevice): """ An NFS device """ |