[[f17 master]] Install grub2 /before/ writing the config file (re: rhbz #809111)

[Peter Jones <pjones@xxxxxxxxxx>]

As Mads said in the bug:

Anaconda, you should run grub2-install first, then grub2-mkconfig.
grub2-mkconfig might look in /boot/grub2 to see what grub2-install
placed there.
---
 pyanaconda/bootloader.py |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 4d3294d..fa263ef 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1772,7 +1772,6 @@ class GRUB2(GRUB):
 
     def write_config(self):
         self.write_config_console(None)
-        self.write_device_map()
         self.write_defaults()
 
         # if we fail to setup password auth we should complete the
@@ -1820,6 +1819,21 @@ class GRUB2(GRUB):
             if rc:
                 raise BootLoaderError("bootloader install failed")
 
+    def write(self):
+        """ Write the bootloader configuration and install the bootloader. """
+        if self.update_only:
+            self.update()
+            return
+
+        self.write_device_map()
+        self.stage2_device.format.sync(root=ROOT_PATH)
+        sync()
+        self.install()
+        sync()
+        self.stage2_device.format.sync(root=ROOT_PATH)
+        self.write_config()
+        sync()
+        self.stage2_device.format.sync(root=ROOT_PATH)
 
 class YabootSILOBase(BootLoader):
     def write_config_password(self, config):
-- 
1.7.10

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