summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2009-07-31 16:34:08 +0200
committerHans de Goede <hdegoede@redhat.com>2009-08-04 10:56:33 +0200
commitbd4e3b43924cc3f3a74892ffa3e0d3d426718858 (patch)
tree6bf7505da8071d3a93a6e7be93a3561d28df54d1
parent131008c24758d963f046f78d1f0ff2edfedbf253 (diff)
downloadanaconda-bd4e3b43924cc3f3a74892ffa3e0d3d426718858.tar.gz
anaconda-bd4e3b43924cc3f3a74892ffa3e0d3d426718858.tar.xz
anaconda-bd4e3b43924cc3f3a74892ffa3e0d3d426718858.zip
Use dracutSetupString() method to add the kernel parameters needed for dracut
-rw-r--r--booty/bootloaderInfo.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py
index bdfb1d90a..3c1ed06cf 100644
--- a/booty/bootloaderInfo.py
+++ b/booty/bootloaderInfo.py
@@ -87,7 +87,15 @@ def rootIsDevice(dev):
class KernelArguments:
def get(self):
- return self.args
+ args = self.args
+ root = self.storage.fsset.rootDevice
+ for d in self.storage.devices:
+ if root.dependsOn(d):
+ dracutSetupString = d.dracutSetupString()
+ if len(dracutSetupString):
+ args += " %s" % dracutSetupString
+
+ return args
def set(self, args):
self.args = args
@@ -107,7 +115,7 @@ class KernelArguments:
self.args = self.args + "%s" % (args,)
- def __init__(self):
+ def __init__(self, storage):
newArgs = []
cfgFilename = "/tmp/install.cfg"
@@ -144,6 +152,7 @@ class KernelArguments:
newArgs.append(arg)
self.args = " ".join(newArgs)
+ self.storage = storage
class BootImages:
@@ -468,7 +477,7 @@ class bootloaderInfo:
drivelist = property(_getDriveList, _setDriveList)
def __init__(self, storage):
- self.args = KernelArguments()
+ self.args = KernelArguments(storage)
self.images = BootImages()
self.device = None
self.defaultDevice = None # XXX hack, used by kickstart