summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2013-05-19 18:59:11 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2013-05-20 10:15:50 +0000
commit764983c38c8dbd331ecdfbe4d8fa1e60a7aa30be (patch)
tree8b60284506254fc8ccb9c4da8eaf3f2cf887a2b5
parentfb623be664e18d06359b21a9b420a24bd22e23f8 (diff)
downloaddefinitions-764983c38c8dbd331ecdfbe4d8fa1e60a7aa30be.tar.gz
Allow installing extlinux to other system versions.
-rwxr-xr-xwriteexts.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/writeexts.py b/writeexts.py
index f6465886..10b17e76 100755
--- a/writeexts.py
+++ b/writeexts.py
@@ -71,7 +71,7 @@ class WriteExtension(cliapp.Application):
self.create_run(version_root)
if self.bootloader_is_wanted():
self.install_kernel(version_root, temp_root)
- self.install_extlinux(mp)
+ self.install_extlinux(mp, version_label)
except BaseException, e:
sys.stderr.write('Error creating disk image')
self.unmount(mp)
@@ -222,7 +222,7 @@ class WriteExtension(cliapp.Application):
cliapp.runcmd(['cp', '-a', try_path, kernel_dest])
break
- def install_extlinux(self, real_root):
+ def install_extlinux(self, real_root, version_label):
'''Install extlinux on the newly created disk image.'''
self.status(msg='Creating extlinux.conf')
@@ -231,9 +231,9 @@ class WriteExtension(cliapp.Application):
f.write('default linux\n')
f.write('timeout 1\n')
f.write('label linux\n')
- f.write('kernel /systems/version1/kernel\n')
+ f.write('kernel /systems/' + version_label + '/kernel\n')
f.write('append root=/dev/sda '
- 'rootflags=subvol=systems/version1/run '
+ 'rootflags=subvol=systems/' + version_label + '/run '
'init=/sbin/init rw\n')
self.status(msg='Installing extlinux')