diff options
author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-05-13 17:03:25 +0100 |
---|---|---|
committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-05-13 17:03:35 +0100 |
commit | ccbece24d26bdc91d1b5b36dc18f3d447f92b109 (patch) | |
tree | b646d4081aadb0b562e403af49a8ce4135f673cf /morphlib | |
parent | 7d10e9e6c06ed0916d0f9247dfff4ebb07127b86 (diff) | |
parent | b7c6473e8f159ccd478a6594afceb6b08a512643 (diff) | |
download | morph-ccbece24d26bdc91d1b5b36dc18f3d447f92b109.tar.gz |
Merge branch 'jonathan/rename-rawdisk-kernel'
Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk
Diffstat (limited to 'morphlib')
-rwxr-xr-x | morphlib/writeexts.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py index c74a4b76..f6465886 100755 --- a/morphlib/writeexts.py +++ b/morphlib/writeexts.py @@ -215,7 +215,7 @@ class WriteExtension(cliapp.Application): self.status(msg='Installing kernel') image_names = ['vmlinuz', 'zImage', 'uImage'] - kernel_dest = os.path.join(version_root, 'linux') + kernel_dest = os.path.join(version_root, 'kernel') for name in image_names: try_path = os.path.join(temp_root, 'boot', name) if os.path.exists(try_path): @@ -231,7 +231,7 @@ class WriteExtension(cliapp.Application): f.write('default linux\n') f.write('timeout 1\n') f.write('label linux\n') - f.write('kernel /systems/version1/linux\n') + f.write('kernel /systems/version1/kernel\n') f.write('append root=/dev/sda ' 'rootflags=subvol=systems/version1/run ' 'init=/sbin/init rw\n') |