diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-04-04 13:47:33 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-04-04 13:47:33 +0000 |
commit | c04760ffe1d385134e5092a22db5e5f78c205038 (patch) | |
tree | 15580c141cc480242259b6f5f08293aa750dda82 /morphlib | |
parent | 761d9b49fe4548f2cc66aed28e0d39bf85496dc0 (diff) | |
parent | 56c74a1368c476ad4c1fcce5adfde201c3eebb5a (diff) | |
download | morph-c04760ffe1d385134e5092a22db5e5f78c205038.tar.gz |
Merge branch 'baserock/pedroalvarez/extra-kernel-args'
Diffstat (limited to 'morphlib')
-rw-r--r-- | morphlib/writeexts.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py index 1849f406..bff21e8d 100644 --- a/morphlib/writeexts.py +++ b/morphlib/writeexts.py @@ -333,11 +333,15 @@ class WriteExtension(cliapp.Application): cliapp.runcmd(['cp', '-a', try_path, kernel_dest]) break + def get_extra_kernel_args(self): + return os.environ.get('KERNEL_ARGS', '') + def install_extlinux(self, real_root): '''Install extlinux on the newly created disk image.''' self.status(msg='Creating extlinux.conf') config = os.path.join(real_root, 'extlinux.conf') + kernel_args = self.get_extra_kernel_args() with open(config, 'w') as f: f.write('default linux\n') f.write('timeout 1\n') @@ -345,7 +349,7 @@ class WriteExtension(cliapp.Application): f.write('kernel /systems/default/kernel\n') f.write('append root=/dev/sda ' 'rootflags=subvol=systems/default/run ' - 'init=/sbin/init rw\n') + '%s init=/sbin/init rw\n' % (kernel_args)) self.status(msg='Installing extlinux') cliapp.runcmd(['extlinux', '--install', real_root]) |