diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-01-20 10:56:08 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-02-17 10:57:02 +0100 |
| commit | 6e8cdf1d26092cb9654e179b04730fff7c15c94f (patch) | |
| tree | d8f60c192176abd8f564e389ede6b955ccf80965 /tests/guix-system.sh | |
| parent | 4cce7610eb992fcf168be7cb05ec2b1b2020171e (diff) | |
| download | guix-6e8cdf1d26092cb9654e179b04730fff7c15c94f.tar guix-6e8cdf1d26092cb9654e179b04730fff7c15c94f.tar.gz | |
scripts: system: Accept <image> records as input.
* guix/scripts/system.scm (system-derivation-for-action): Replace "os"
argument by "image". Remove "image-size", "image-type", "label" and
"volatile-root?" arguments.
(perform-action): Ditto.
(process-action): Construct the <image> record and pass it to "perform-action"
procedure.
* tests/guix-system.sh: Adapt accordingly.
* gnu/system/images/hurd.scm: Return the default image.
* gnu/system/images/novena.scm: Ditto.
* gnu/system/images/pine64.scm: Ditto.
* gnu/system/images/pinebook-pro.scm Ditto.
Diffstat (limited to 'tests/guix-system.sh')
| -rw-r--r-- | tests/guix-system.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 8bc0dcf2fc..238c8929a8 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -337,12 +337,11 @@ for example in gnu/system/examples/*.tmpl; do guix system -n disk-image $target "$example" done -# Verify that the disk image types can be built. +# Verify that the images can be built. guix system -n vm gnu/system/examples/vm-image.tmpl +guix system -n image gnu/system/images/pinebook-pro.scm guix system -n image -t qcow2 gnu/system/examples/vm-image.tmpl -# This invocation was taken care of in the loop above: -# guix system -n disk-image gnu/system/examples/bare-bones.tmpl -guix system -n disk-image -t iso9660 gnu/system/examples/bare-bones.tmpl +guix system -n image -t iso9660 gnu/system/examples/bare-bones.tmpl guix system -n docker-image gnu/system/examples/docker-image.tmpl # Verify that at least the raw image type is available. |