diff options
| -rw-r--r-- | bootloader.py | 22 | ||||
| -rw-r--r-- | instdata.py | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/bootloader.py b/bootloader.py index f7d20fba5..ca4c27f7f 100644 --- a/bootloader.py +++ b/bootloader.py @@ -260,6 +260,20 @@ class bootloaderInfo: return "" + def getArgList(self): + args = [] + + if self.args.get(): + args.append("--append") + args.append(self.args.get()) + + return args + + def writeKS(self, f): + f.write("bootloader") + for arg in self.getArgList(): + f.write(" " + arg) + f.write("\n") def __init__(self): self.args = KernelArguments() @@ -429,6 +443,14 @@ class x86BootloaderInfo(bootloaderInfo): str = self.writeLilo(instRoot, fsset, bl, langs, kernelList, chainList, defaultDev, justConfig) + def getArgList(self): + args = bootloaderInfo.getArgList(self) + + if not self.useGrubVal: + args.append("--useLilo") + # XXX add location of bootloader here too + + return args def __init__(self): bootloaderInfo.__init__(self) diff --git a/instdata.py b/instdata.py index 228dd52d1..1a966084f 100644 --- a/instdata.py +++ b/instdata.py @@ -127,6 +127,7 @@ class InstallData: self.firewall.writeKS(f) self.auth.writeKS(f) self.timezone.writeKS(f) + self.bootloader.writeKS(f) f.write("\n%packages\n") packages = {} |