summaryrefslogtreecommitdiff
path: root/tests.branching/setup
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-07-23 14:59:57 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-07-23 14:59:57 +0100
commit82ae6038c00ca7ceb0e1ed206bd07157e1658f50 (patch)
treecff2b166c37740b2301145bc0b44c647bd7b12a4 /tests.branching/setup
parente14084d535ddf37722da692133e9000d8f55a5d5 (diff)
parentdfaf624b1fb97c2208bf03b9ff314c5566575e5f (diff)
downloadmorph-82ae6038c00ca7ceb0e1ed206bd07157e1658f50.tar.gz
Merge branch 'liw/require-system-kind'
Reviewed-By: Richard Maw Reviewed-By: Lars Wirzenius
Diffstat (limited to 'tests.branching/setup')
-rwxr-xr-xtests.branching/setup1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.branching/setup b/tests.branching/setup
index 3b9e7e7b..24627bce 100755
--- a/tests.branching/setup
+++ b/tests.branching/setup
@@ -48,6 +48,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph"
{
"name": "hello-system",
"kind": "system",
+ "system-kind": "dummy",
"disk-size": "1G",
"strata": [
"hello-stratum"