[f17-branch master] Don't allow grub2-install to set boot order in nvram on ppc.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Since we're setting it ourselves, letting grub2-install do it will
just cause problems.
---
 pyanaconda/bootloader.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 2389a4a..fd6f3f2 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1815,10 +1815,10 @@ class GRUB2(GRUB):
     # installation
     #
 
-    def install(self):
+    def install(self, 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.
@@ -2056,7 +2056,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):
-- 
1.7.10.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux