diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-12 13:59:09 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-12 14:10:00 +0000 |
| commit | 0cc7d159c197296dae699d77ea54759f8c4b2ad5 (patch) | |
| tree | 3f0b8313d616efbc825c3687baf255200195d63f /morphlib/exts | |
| parent | 1a6fb660b94228745efc4543138b9dc1fa50e912 (diff) | |
| parent | 49ebc494b40a772b089961a0c74d143d017383c2 (diff) | |
| download | morph-0cc7d159c197296dae699d77ea54759f8c4b2ad5.tar.gz | |
Merge remote-tracking branch 'origin/baserock/james/writeexts_support_jetson'baserock/richardmaw/james/writeexts_support_jetson
Diffstat (limited to 'morphlib/exts')
| -rwxr-xr-x | morphlib/exts/rawdisk.write | 7 |
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) |