summaryrefslogtreecommitdiff
path: root/tests.as-root/setup
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-10-08 15:53:21 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-10-08 15:53:21 +0000
commit6e36e9a1a29495f0c8b62fedddadcf8df78506d9 (patch)
tree609fc24eaf3d9ac9ed14d6520cccae147a7f3907 /tests.as-root/setup
parentc63bd810e953429b728adbadf60f10a08e6d4a06 (diff)
parentf4aaea23b7d80084504832d6b967a50c2d501b9e (diff)
downloadmorph-6e36e9a1a29495f0c8b62fedddadcf8df78506d9.tar.gz
Merge remote-tracking branch 'origin/danielfirth/RT189'
Changed the error (exception) to list all obsolete fields.
Diffstat (limited to 'tests.as-root/setup')
-rwxr-xr-xtests.as-root/setup4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests.as-root/setup b/tests.as-root/setup
index eea9e061..2ab1cd94 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -134,9 +134,7 @@ git add tools-stratum.morph
cat <<EOF > hello-system.morph
name: hello-system
kind: system
-system-kind: rootfs-tarball
arch: `uname -m`
-disk-size: 1G
strata:
- morph: hello-stratum
repo: test:morphs
@@ -163,9 +161,7 @@ git add linux-stratum.morph
cat <<EOF > linux-system.morph
name: linux-system
kind: system
-system-kind: rootfs-tarball
arch: `uname -m`
-disk-size: 1G
strata:
- morph: hello-stratum
repo: test:morphs