diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | installclass.py | 10 | ||||
| -rw-r--r-- | kickstart.py | 6 |
3 files changed, 16 insertions, 4 deletions
@@ -47,6 +47,10 @@ * flags.py (Flags.createCmdlineDict): Work around a quoting bug in pxelinux (#248170). + * installclass.py (BaseInstallClass.setBootloader): Accept the + timeout parameter and pass it along to booty. + * kickstart.py (Bootloader): Subclass from the correct version. + 2007-10-18 Peter Jones <pjones@redhat.com> * isys/isys.c: add matchPathContext and setFileContext calls, diff --git a/installclass.py b/installclass.py index e4be528b8..d2229e35d 100644 --- a/installclass.py +++ b/installclass.py @@ -85,19 +85,27 @@ class BaseInstallClass(object): anaconda.method.postAction(anaconda) def setBootloader(self, id, location=None, forceLBA=0, password=None, - md5pass=None, appendLine="", driveorder = []): + md5pass=None, appendLine="", driveorder = [], + timeout=None): if appendLine: id.bootloader.args.set(appendLine) + id.bootloader.setForceLBA(forceLBA) + if password: id.bootloader.setPassword(password, isCrypted = 0) + if md5pass: id.bootloader.setPassword(md5pass) + if location != None: id.bootloader.defaultDevice = location else: id.bootloader.defaultDevice = -1 + if timeout: + id.bootloader.timeout = timeout + # XXX throw out drives specified that don't exist. anything else # seems silly if driveorder and len(driveorder) > 0: diff --git a/kickstart.py b/kickstart.py index 3f8f4a497..5e72bfc69 100644 --- a/kickstart.py +++ b/kickstart.py @@ -122,9 +122,9 @@ class AutoStep(commands.autostep.FC3_AutoStep): flags.autostep = 1 flags.autoscreenshot = self.autoscreenshot -class Bootloader(commands.bootloader.FC4_Bootloader): +class Bootloader(commands.bootloader.FC8_Bootloader): def parse(self, args): - commands.bootloader.FC4_Bootloader.parse(self, args) + commands.bootloader.FC8_Bootloader.parse(self, args) if self.location == "none": location = None @@ -152,7 +152,7 @@ class Bootloader(commands.bootloader.FC4_Bootloader): self.handler.showSteps.append("bootloader") self.handler.id.instClass.setBootloader(self.handler.id, location, self.forceLBA, self.password, self.md5pass, - self.appendLine, self.driveorder) + self.appendLine, self.driveorder, self.timeout) self.handler.permanentSkipSteps.extend(["upgbootloader", "bootloader", "bootloaderadvanced"]) |