summaryrefslogtreecommitdiffstats
path: root/floppy.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-04-19 06:28:35 +0000
committerJeremy Katz <katzj@redhat.com>2002-04-19 06:28:35 +0000
commit8e7a9bc91b98a02e41dd6d53e8a2027c482346a8 (patch)
tree1c94bb1caace167e96375666ad0cc9467e83d471 /floppy.py
parent34e94e67312be97452e79939ae7104afae3c041b (diff)
downloadanaconda-8e7a9bc91b98a02e41dd6d53e8a2027c482346a8.tar.gz
anaconda-8e7a9bc91b98a02e41dd6d53e8a2027c482346a8.tar.xz
anaconda-8e7a9bc91b98a02e41dd6d53e8a2027c482346a8.zip
more merging fun from the hampton branch. I'm pretty sure this doesn't
work now, at least in gui. text mode might, though
Diffstat (limited to 'floppy.py')
-rw-r--r--floppy.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/floppy.py b/floppy.py
index 9a6f7af14..6980dd3ed 100644
--- a/floppy.py
+++ b/floppy.py
@@ -48,7 +48,7 @@ def probeFloppyDevice():
log("anaconda floppy device is %s", fdDevice)
return fdDevice
-def makeBootdisk (intf, floppyDevice, hdList, instPath):
+def makeBootdisk (intf, floppyDevice, hdList, instPath, bootloader):
if flags.test:
return DISPATCH_NOOP
@@ -70,9 +70,15 @@ def makeBootdisk (intf, floppyDevice, hdList, instPath):
kernelTag = "-%s-%s" % (kernel[rpm.RPMTAG_VERSION],
kernel[rpm.RPMTAG_RELEASE])
+ if bootloader.args.get():
+ args = bootloader.args.get()
+ else:
+ args = ""
+
w = intf.waitWindow (_("Creating"), _("Creating boot disk..."))
rc = iutil.execWithRedirect("/sbin/mkbootdisk",
[ "/sbin/mkbootdisk",
+ "--kernelargs", args,
"--noprompt",
"--device",
"/dev/" + floppyDevice,