summaryrefslogtreecommitdiff
path: root/tests.as-root
diff options
context:
space:
mode:
authorDan Firth <dan.firth@codethink.co.uk>2013-09-27 09:51:31 +0000
committerDan Firth <dan.firth@codethink.co.uk>2013-09-27 11:15:48 +0000
commit1bc8aa188896fc7668427f19a4ffd89ca5f6fa3c (patch)
treea9cbd2149e9b4b3d10f605367e3a96760972cde1 /tests.as-root
parent3d93d272079b602aefe5d3bcd660d4a3307f3aad (diff)
downloadmorph-1bc8aa188896fc7668427f19a4ffd89ca5f6fa3c.tar.gz
Dropped support for 'disk-size' from system morphology files'
Diffstat (limited to 'tests.as-root')
-rwxr-xr-xtests.as-root/archless-system-fails.script3
-rwxr-xr-xtests.as-root/setup2
-rwxr-xr-xtests.as-root/system-overlap.script1
3 files changed, 1 insertions, 5 deletions
diff --git a/tests.as-root/archless-system-fails.script b/tests.as-root/archless-system-fails.script
index eda797f1..2fdeb018 100755
--- a/tests.as-root/archless-system-fails.script
+++ b/tests.as-root/archless-system-fails.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2011, 2012 Codethink Limited
+# Copyright (C) 2011-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
@@ -26,7 +26,6 @@ cat <<EOF >archless-system.morph
{
"name": "archless-system",
"kind": "system",
- "disk-size": "1G",
"strata": [
{
"morph": "hello-stratum",
diff --git a/tests.as-root/setup b/tests.as-root/setup
index eea9e061..2c5e09ca 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -136,7 +136,6 @@ name: hello-system
kind: system
system-kind: rootfs-tarball
arch: `uname -m`
-disk-size: 1G
strata:
- morph: hello-stratum
repo: test:morphs
@@ -165,7 +164,6 @@ name: linux-system
kind: system
system-kind: rootfs-tarball
arch: `uname -m`
-disk-size: 1G
strata:
- morph: hello-stratum
repo: test:morphs
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 6e6ef2ac..5df9374b 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -33,7 +33,6 @@ cat <<EOF >overlap-system.morph
"kind": "system",
"system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
- "disk-size": "1G",
"strata": [
{
"morph": "foo-baz-stratum",