summaryrefslogtreecommitdiff
path: root/tests.as-root
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-04-23 14:50:11 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-04-23 15:20:08 +0100
commite421f9037f21454f39d67098edfead74b4e2a2ff (patch)
tree9b09e9c59e9bfd23794d4a7a18f6fc0ae38c959b /tests.as-root
parente7e90384da00a8197c5e0363a5a4005754a790eb (diff)
downloadmorph-e421f9037f21454f39d67098edfead74b4e2a2ff.tar.gz
Fix tests to use rootfs-tarball system-kinds, instead of disks
Diffstat (limited to 'tests.as-root')
-rwxr-xr-xtests.as-root/setup4
-rwxr-xr-xtests.as-root/system-overlap.script2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests.as-root/setup b/tests.as-root/setup
index b9d5d477..eea9e061 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -134,7 +134,7 @@ git add tools-stratum.morph
cat <<EOF > hello-system.morph
name: hello-system
kind: system
-system-kind: syslinux-disk
+system-kind: rootfs-tarball
arch: `uname -m`
disk-size: 1G
strata:
@@ -163,7 +163,7 @@ git add linux-stratum.morph
cat <<EOF > linux-system.morph
name: linux-system
kind: system
-system-kind: syslinux-disk
+system-kind: rootfs-tarball
arch: `uname -m`
disk-size: 1G
strata:
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index b8888491..6e6ef2ac 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -31,7 +31,7 @@ cat <<EOF >overlap-system.morph
{
"name": "overlap-system",
"kind": "system",
- "system-kind": "syslinux-disk",
+ "system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
"disk-size": "1G",
"strata": [