Merge branch 'baserock/richardmaw/james/writeexts_support_jetson'

Reviewed by: Richard Maw <richard.maw@codethink.co.uk>
Merged by: James Thomas <james.thomas@codethink.co.uk>

1 files changed, 4 insertions, 3 deletions

diff --git a/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write
index 87edf7bf..1c2c5a84 100755
--- a/morphlib/exts/rawdisk.write
+++ b/morphlib/exts/rawdisk.write
@@ -85,11 +85,12 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension):
         else:
             # we are upgrading and old system that does
             # not have an updated extlinux config file
-            if self.bootloader_is_wanted():
-                self.install_extlinux(mp)
+            if self.bootloader_config_is_wanted():
+                self.generate_bootloader_config(mp)
+            self.install_bootloader(mp)
         os.symlink(version_label, default_path)
 
-        if self.bootloader_is_wanted():
+        if self.bootloader_config_is_wanted():
             self.install_kernel(version_root, temp_root)
 
         self.unmount(mp)