diff options
| author | Jeremy Katz <katzj@redhat.com> | 2001-08-28 20:34:22 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2001-08-28 20:34:22 +0000 |
| commit | 5eb18a0315cd1a75e9b09e8d92db0f593431477e (patch) | |
| tree | 741402f5e7f12729b4ddecd5a26b3e17c8674bc5 | |
| parent | 65c19b84759a777cc5f9666c4b197967f6312bf8 (diff) | |
| download | anaconda-5eb18a0315cd1a75e9b09e8d92db0f593431477e.tar.gz anaconda-5eb18a0315cd1a75e9b09e8d92db0f593431477e.tar.xz anaconda-5eb18a0315cd1a75e9b09e8d92db0f593431477e.zip | |
add /etc/grub.conf symlink as suggested by mkj; mv /etc/lilo.conf /etc/lilo.conf.anaconda if grub is being used so that /sbin/installkernel doesn't screw things up
| -rw-r--r-- | bootloader.py | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/bootloader.py b/bootloader.py index a3a2bcdf9..cd0953e4a 100644 --- a/bootloader.py +++ b/bootloader.py @@ -522,6 +522,13 @@ class x86BootloaderInfo(bootloaderInfo): os.rename(instRoot + "/boot/grub/menu.lst", instRoot + "/boot/grub/menu.lst.rpmsave") os.symlink("./grub.conf", instRoot + "/boot/grub/menu.lst") + + # make a symlink for /etc/grub.conf since config files belong in /etc + if os.access (instRoot + "/etc/grub.conf", os.R_OK): + os.rename(instRoot + "/etc/grub.conf", + instRoot + "/etc/grub.conf.rpmsave") + os.symlink("../boot/grub/grub.conf", instRoot + "/etc/grub.conf") + if not os.access(instRoot + "/boot/grub/device.map", os.R_OK): f = open(instRoot + "/boot/grub/device.map", "w+") @@ -624,13 +631,20 @@ class x86BootloaderInfo(bootloaderInfo): defaultDev, justConfig, intf): if len(kernelList) < 1: self.noKernelsWarn(intf) - + str = self.writeLilo(instRoot, fsset, bl, langs, kernelList, chainList, defaultDev, justConfig | (self.useGrubVal)) str = self.writeGrub(instRoot, fsset, bl, langs, kernelList, chainList, defaultDev, justConfig | (not self.useGrubVal)) + # XXX move the lilo.conf out of the way if they're using GRUB + # so that /sbin/installkernel does a more correct thing + if self.useGrubVal: + os.rename(instRoot + "/etc/lilo.conf", + instRoot + "/etc/lilo.conf.anaconda") + + def getArgList(self): args = bootloaderInfo.getArgList(self) |