summaryrefslogtreecommitdiffstats
path: root/pyanaconda/bootloader.py
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2012-06-04 12:47:21 -0400
committerPeter Jones <pjones@redhat.com>2012-06-05 13:25:56 -0400
commit8f8e90a58da05561b7a1e2a9e797d1ac86b3fceb (patch)
treea8538ae52d6a1739fcbdd57deefdf3fcd85e1aed /pyanaconda/bootloader.py
parent3612ec5edbd7861cf141305db359309f2c0dac02 (diff)
downloadanaconda-8f8e90a58da05561b7a1e2a9e797d1ac86b3fceb.tar.gz
anaconda-8f8e90a58da05561b7a1e2a9e797d1ac86b3fceb.tar.xz
anaconda-8f8e90a58da05561b7a1e2a9e797d1ac86b3fceb.zip
Don't allow grub2-install to set boot order in nvram on ppc.
Since we're setting it ourselves, letting grub2-install do it will just cause problems.
Diffstat (limited to 'pyanaconda/bootloader.py')
-rw-r--r--pyanaconda/bootloader.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index ff6766408..29394b152 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1710,10 +1710,13 @@ class GRUB2(GRUB):
# installation
#
- def install(self):
+ def install(self, args=None):
+ if args is None:
+ args = []
+
# XXX will installing to multiple drives work as expected with GRUBv2?
for (stage1dev, stage2dev) in self.install_targets:
- args = ["--no-floppy", stage1dev.path]
+ args += ["--no-floppy", stage1dev.path]
if stage1dev == stage2dev:
# This is hopefully a temporary hack. GRUB2 currently refuses
# to install to a partition's boot block without --force.
@@ -2054,7 +2057,7 @@ class IPSeriesGRUB2(GRUB2):
def install(self):
self.updateNVRAMBootList()
- super(IPSeriesGRUB2, self).install()
+ super(IPSeriesGRUB2, self).install(args=["--no-nvram"])
# This will update the PowerPC's (ppc) bios boot devive order list
def updateNVRAMBootList(self):