[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
[PATCH] Initialize x86 class variables before efiBootloaderInfo.__init__()
- From: Peter Jones <pjones redhat com>
- To: anaconda-devel-list redhat com
- Cc:
- Subject: [PATCH] Initialize x86 class variables before efiBootloaderInfo.__init__()
- Date: Tue, 28 Apr 2009 17:05:23 -0400
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.
---
booty/x86.py | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/booty/x86.py b/booty/x86.py
index 99f2e5d..84d2625 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/"
--
1.6.2.2
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]