diff options
| author | Jeremy Katz <katzj@redhat.com> | 2001-07-16 22:10:50 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2001-07-16 22:10:50 +0000 |
| commit | 35d6aa6b71c6e1c0fe86d9c7d3ae821cafcee158 (patch) | |
| tree | 48b29fcc969043b59ae036b59ba6755eb3fab88a | |
| parent | cf60b8fa1281fb1ee77bd48a317110d407cadc07 (diff) | |
| download | anaconda-35d6aa6b71c6e1c0fe86d9c7d3ae821cafcee158.tar.gz anaconda-35d6aa6b71c6e1c0fe86d9c7d3ae821cafcee158.tar.xz anaconda-35d6aa6b71c6e1c0fe86d9c7d3ae821cafcee158.zip | |
write both lilo and grub configs out (49195)
| -rw-r--r-- | bootloader.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/bootloader.py b/bootloader.py index 4e40f2786..96ede0039 100644 --- a/bootloader.py +++ b/bootloader.py @@ -371,6 +371,9 @@ class x86BootloaderInfo(bootloaderInfo): images = bl.images.getImages() rootDev = fsset.getEntryByMountPoint("/").device.getDevice() + if not os.path.isdir(instRoot + '/boot/grub/'): + os.mkdir(instRoot + '/boot/grub', 0755) + cf = '/boot/grub/grub.conf' self.perms = 0600 if os.access (instRoot + cf, os.R_OK): @@ -501,12 +504,12 @@ class x86BootloaderInfo(bootloaderInfo): def write(self, instRoot, fsset, bl, langs, kernelList, chainList, defaultDev, justConfig): - if self.useGrubVal: - str = self.writeGrub(instRoot, fsset, bl, langs, kernelList, - chainList, defaultDev, justConfig) - else: - str = self.writeLilo(instRoot, fsset, bl, langs, kernelList, - chainList, defaultDev, justConfig) + str = self.writeGrub(instRoot, fsset, bl, langs, kernelList, + chainList, defaultDev, + justConfig | (not self.useGrubVal)) + str = self.writeLilo(instRoot, fsset, bl, langs, kernelList, + chainList, defaultDev, + justConfig | (self.useGrubVal)) def getArgList(self): args = bootloaderInfo.getArgList(self) |