summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-03-11 18:15:29 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-03-12 11:47:51 +0000
commitf2ebb9033dc6e86f508578b209b713f578b62c42 (patch)
treedd2e6b6162f55f11159ba0ec90cd9acd56388b0f
parent53e8289b810a9f3effb6b1b8f5d22f5fcbf37ca9 (diff)
downloadmorph-f2ebb9033dc6e86f508578b209b713f578b62c42.tar.gz
Emit warning if system-kind != rootfs-tarball
-rw-r--r--morphlib/morph2_tests.py2
-rw-r--r--morphlib/morphologyfactory.py11
2 files changed, 12 insertions, 1 deletions
diff --git a/morphlib/morph2_tests.py b/morphlib/morph2_tests.py
index 49be9c8c..1a0b4822 100644
--- a/morphlib/morph2_tests.py
+++ b/morphlib/morph2_tests.py
@@ -309,7 +309,7 @@ class MorphologyTests(unittest.TestCase):
"kind": "system",
"disk-size": "1g",
"arch": "x86_64",
- "system-kind": "syslinux-disk"
+ "system-kind": "rootfs-tarball"
}'''
def test_writing_preserves_disk_size(self):
diff --git a/morphlib/morphologyfactory.py b/morphlib/morphologyfactory.py
index 76905eb9..817d7fcd 100644
--- a/morphlib/morphologyfactory.py
+++ b/morphlib/morphologyfactory.py
@@ -110,6 +110,17 @@ class MorphologyFactory(object):
raise morphlib.Error('No system-kind defined in system %s '
'(it is a mandatory field)' % filename)
+ if morphology['system-kind'] != 'rootfs-tarball':
+ self._app.status(
+ msg='You are using a system-kind %(kind)s. '
+ 'This is deprecated and untested functionality that will '
+ 'be removed in a future version of Baserock. The only '
+ 'supported system-kind is rootfs-tarball. '
+ 'Please convert your system morphologies to '
+ 'rootfs-tarball and use morph deploy to create '
+ 'disk images.',
+ kind=morphology['system-kind'])
+
name = morphology['name']
morphology.builds_artifacts = [name + '-rootfs']