summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-02-19 11:34:57 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-02-19 11:34:57 +0000
commitf8265bddbe9f8499b2b3b6889b7340b9a6f9c0c4 (patch)
treee791475977a2459c4f3bdfad8c6be538c956dc71
parentd5763c366f82153d7eeab340f9d751c043c0e156 (diff)
parent787570186ce987f76dda44761f932c0e2af12b3f (diff)
downloadmorphs-f8265bddbe9f8499b2b3b6889b7340b9a6f9c0c4.tar.gz
Merge remote-tracking branch 'origin/liw/tarball-systems'
-rw-r--r--base-system-x86_32-generic.morph2
-rw-r--r--base-system-x86_64-generic.morph2
-rw-r--r--devel-system-x86_32-generic.morph2
-rw-r--r--devel-system-x86_64-generic.morph2
4 files changed, 4 insertions, 4 deletions
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index 23f518d..2e29dbe 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -2,7 +2,7 @@
"name": "base-system-x86_32-generic",
"description": "The set of strata required to have a minimal system for a 32-bit x86 system.",
"kind": "system",
- "system-kind": "syslinux-disk",
+ "system-kind": "rootfs-tarball",
"arch": "x86_32",
"disk-size": "2G",
"strata": [
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index c41be08..4ae4e71 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -2,7 +2,7 @@
"name": "base-system-x86_64-generic",
"description": "The set of strata required to have a minimal system for a 64-bit x86 system.",
"kind": "system",
- "system-kind": "syslinux-disk",
+ "system-kind": "rootfs-tarball",
"arch": "x86_64",
"disk-size": "2G",
"strata": [
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index ed67df8..c0f4b87 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -2,7 +2,7 @@
"name": "devel-system-x86_32-generic",
"description": "A system that is able to build other systems based on the 32-bit x86 architecture.",
"kind": "system",
- "system-kind": "syslinux-disk",
+ "system-kind": "rootfs-tarball",
"arch": "x86_32",
"disk-size": "2G",
"strata": [
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index ebaf46e..4872961 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -2,7 +2,7 @@
"name": "devel-system-x86_64-generic",
"description": "A system that is able to build other systems based on the 64-bit x86 architecture.",
"kind": "system",
- "system-kind": "syslinux-disk",
+ "system-kind": "rootfs-tarball",
"arch": "x86_64",
"disk-size": "2G",
"strata": [