summaryrefslogtreecommitdiff
path: root/morphlib
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-13 18:17:01 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-14 17:39:11 +0000
commit9ba179509f4ac19026628bd9f17b896f3d85232a (patch)
tree27d3bd0ef15bfd10507f2585deb857191e72b18f /morphlib
parent7339b195554ad0d439017bdcce2426e824e66210 (diff)
downloadmorph-9ba179509f4ac19026628bd9f17b896f3d85232a.tar.gz
Enable syslinux systembuilder on all systems
This is a kludge which I am only doing because we are removing this plugin soon. Morph no longer has a way to detect the architecture that it is running on and no longer needs one anywhere else.
Diffstat (limited to 'morphlib')
-rw-r--r--morphlib/plugins/syslinux-disk-systembuilder_plugin.py19
1 files changed, 8 insertions, 11 deletions
diff --git a/morphlib/plugins/syslinux-disk-systembuilder_plugin.py b/morphlib/plugins/syslinux-disk-systembuilder_plugin.py
index cc47389c..f05375f2 100644
--- a/morphlib/plugins/syslinux-disk-systembuilder_plugin.py
+++ b/morphlib/plugins/syslinux-disk-systembuilder_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012 Codethink Limited
+# Copyright (C) 2012-2013 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -84,16 +84,13 @@ class SyslinuxDiskBuilder(DiskImageBuilder): # pragma: no cover
class SyslinuxDiskBuilderPlugin(cliapp.Plugin):
def enable(self):
- # Only provide this system builder on architectures that are
- # supported by syslinux.
- if morphlib.util.arch() in ['x86_64', 'i386', 'i486', 'i586', 'i686']:
- self.app.settings.string_list(
- ['syslinux-mbr-search-paths'],
- 'A list of files to search for to use as the syslinux mbr',
- default=['/usr/lib/extlinux/mbr.bin',
- '/usr/share/syslinux/mbr.bin'],
- group='Build Options')
- self.app.system_kind_builder_factory.register(SyslinuxDiskBuilder)
+ self.app.settings.string_list(
+ ['syslinux-mbr-search-paths'],
+ 'A list of files to search for to use as the syslinux mbr',
+ default=['/usr/lib/extlinux/mbr.bin',
+ '/usr/share/syslinux/mbr.bin'],
+ group='Build Options')
+ self.app.system_kind_builder_factory.register(SyslinuxDiskBuilder)
def disable(self):
pass