Add leavebootorder option (anaconda) (revised for master, sigh)

https://bugzilla.redhat.com/show_bug.cgi?id=827116

The default on PowerPC machines is to change the boot order to boot into the
newly installed drive.  There are install scenarios where this is not
preferable.  So, I have added a new boot commandline and kickstart option
called leavebootorder.

1 files changed, 9 insertions, 2 deletions

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 29394b152..1982af017 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1076,6 +1076,9 @@ class BootLoader(object):
         if self.drive_order:
             f.write(" --driveorder=%s" % ",".join(self.drive_order))
 
+        if flags.leavebootorder:
+            f.write(" --leavebootorder")
+
         append = self.boot_args - self.dracut_args
         if append:
             f.write(" --append=\"%s\"" % append)
@@ -1813,7 +1816,8 @@ class EFIGRUB(GRUB2):
             raise BootLoaderError("failed to set new efi boot target")
 
     def install(self):
-        self.remove_efi_boot_target()
+        if not flags.leavebootorder:
+            self.remove_efi_boot_target()
         self.add_efi_boot_target()
 
     def update(self):
@@ -2055,7 +2059,10 @@ class IPSeriesGRUB2(GRUB2):
     #
 
     def install(self):
-        self.updateNVRAMBootList()
+        if flags.leavebootorder:
+            log.info("leavebootorder passed as an option. Will not update the NVRAM boot list.")
+        else:
+            self.updateNVRAMBootList()
 
         super(IPSeriesGRUB2, self).install(args=["--no-nvram"])