Merge branch 'baserock/tiagogomes/default-symlink' of git://git.baserock.org/baserock/baserock/morph

Reviewed by Richard Maw and Lars Wirzenius

1 files changed, 9 insertions, 1 deletions

diff --git a/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write
index a43a9cce..62d39b31 100755
--- a/morphlib/exts/rawdisk.write
+++ b/morphlib/exts/rawdisk.write
@@ -70,9 +70,17 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension):
 
         self.create_run(version_root)
 
+        default_path = os.path.join(mp, 'systems', 'default')
+        if os.path.exists(default_path):
+            os.remove(default_path)
+        else:
+            # we are upgrading and old system that does
+            # not have an updated extlinux config file
+            self.install_extlinux(mp)
+        os.symlink(version_label, default_path)
+
         if self.bootloader_is_wanted():
             self.install_kernel(version_root, temp_root)
-            self.install_extlinux(mp, version_label)
 
         self.unmount(mp)