Part of the changes I'm doing for dracut support for DASD is modifying
the dracutSetupString methods to return a dict of key/value pairs for
the kernel parameters rather than a string. This will help with
constructing the dasd= parameter. To make it obvious this methods are
not returning a string, I've renamed them.
---
booty/bootloaderInfo.py | 12 ++++++------
language.py | 2 +-
network.py | 2 +-
storage/devices.py | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py
index 4919cf3..3c3fd7e 100644
--- a/booty/bootloaderInfo.py
+++ b/booty/bootloaderInfo.py
@@ -91,16 +91,16 @@ class KernelArguments:
root = self.id.storage.rootDevice
for d in self.id.storage.devices:
if root.dependsOn(d):
- dracutSetupString = d.dracutSetupString()
- if len(dracutSetupString):
- args += " %s" % dracutSetupString
+ dracutSetupData = d.dracutSetupData()
+ if len(dracutSetupData):
+ args += " %s" % dracutSetupData
import storage
if isinstance(d, storage.devices.NetworkStorageDevice):
args += " "
- args += self.id.network.dracutSetupString(d)
+ args += self.id.network.dracutSetupData(d)
- args += self.id.instLanguage.dracutSetupString()
- args += self.id.keyboard.dracutSetupString()
+ args += self.id.instLanguage.dracutSetupData()
+ args += self.id.keyboard.dracutSetupData()
if args and self.appendArgs:
args += " "
diff --git a/language.py b/language.py
index c4f7bf5..cfcc92e 100644
--- a/language.py
+++ b/language.py
@@ -199,7 +199,7 @@ class Language(object):
def available(self):
return self.nativeLangNames.keys()
- def dracutSetupString(self):
+ def dracutSetupData(self):
args=""
for (key, val) in self.info.iteritems():
diff --git a/network.py b/network.py
index 3b0dacf..c51d3af 100644
--- a/network.py
+++ b/network.py
@@ -793,7 +793,7 @@ class Network:
return False
# get a kernel cmdline string for dracut needed for access to host host
- def dracutSetupString(self, networkStorageDevice):
+ def dracutSetupData(self, networkStorageDevice):
netargs=""
if networkStorageDevice.nic:
diff --git a/storage/devices.py b/storage/devices.py
index 3cc3aac..4d11932 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -325,7 +325,7 @@ class Device(object):
return False
- def dracutSetupString(self):
+ def dracutSetupData(self):
return ""
@property
@@ -3001,7 +3001,7 @@ 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 dracutSetupData(self):
if self.ibft:
return "iscsi_firmware"
@@ -3032,7 +3032,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 dracutSetupData(self):
return "netroot=fcoe:%s:nodcb" % self.nic
--
1.6.2.5
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
