summaryrefslogtreecommitdiffstats
path: root/booty
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2009-04-28 17:03:45 -0400
committerPeter Jones <pjones@redhat.com>2009-04-28 17:26:55 -0400
commit3841180e4d470712a015d4bc20f8ce4ec23a99a0 (patch)
treefed42fc7de870298a36d8f4ecc63d37e9786840f /booty
parent27d8dc9bf0f4410bafbe3559caa5c344fab44a63 (diff)
downloadanaconda-3841180e4d470712a015d4bc20f8ce4ec23a99a0.tar.gz
anaconda-3841180e4d470712a015d4bc20f8ce4ec23a99a0.tar.xz
anaconda-3841180e4d470712a015d4bc20f8ce4ec23a99a0.zip
Initialize x86 class variables before efiBootloaderInfo.__init__()
If self._configdir and self._configname are set after efiBootloaderInfo.__init__() is called, they're never right for EFI systems. If we set them before, efiBootloaderInfo.__init__() only *conditionally* overwrites them, so normal x86 is safe.
Diffstat (limited to 'booty')
-rw-r--r--booty/x86.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/booty/x86.py b/booty/x86.py
index 99f2e5d93..84d26257e 100644
--- a/booty/x86.py
+++ b/booty/x86.py
@@ -552,10 +552,14 @@ class x86BootloaderInfo(efiBootloaderInfo):
def __init__(self, storage):
bootloaderInfo.__init__(self, storage)
- efiBootloaderInfo.__init__(self, storage, initialize=False)
+ # these have to be set /before/ efiBootloaderInfo.__init__(), or
+ # they'll be overwritten.
self._configdir = "/boot/grub"
self._configname = "grub.conf"
+
+ efiBootloaderInfo.__init__(self, storage, initialize=False)
+
# XXX use checkbootloader to determine what to default to
self.useGrubVal = 1
self.kernelLocation = "/boot/"