summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-12-16 13:45:00 +0100
committerMathieu Othacehe <othacehe@gnu.org>2021-12-23 10:54:00 +0100
commitc37cd417644b010c39d4d7ffb46dffd7b862aaa5 (patch)
treeb667e9fd3adaeea2529e8766fc8bc56a3c11576a
parent3ed8ddd606b5465bc502204f8a7fc4389ca9ab3f (diff)
downloadguix-c37cd417644b010c39d4d7ffb46dffd7b862aaa5.tar.gz
scripts: system: Pass the volatile field to VM generation.
* guix/scripts/system.scm (system-derivation-for-action): Add new volatile?
argument and pass it to system-qemu-image/shared-store-script.
(perform-action): Add new volatile? argument and pass it to
system-derivation-for-action.
(process-action): Pass the volatile? argument to perform-action.
-rw-r--r--guix/scripts/system.scm5
1 files changed, 5 insertions, 0 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index a5d9bb4779..a73fe55418 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -689,6 +689,7 @@ checking this by themselves in their 'check' procedure."
 (define* (system-derivation-for-action image action
                                        #:key
                                        full-boot?
+                                       volatile?
                                        (graphic? #t)
                                        container-shared-network?
                                        mappings)
@@ -707,6 +708,7 @@ checking this by themselves in their 'check' procedure."
       ((vm)
        (system-qemu-image/shared-store-script os
                                               #:full-boot? full-boot?
+                                              #:volatile? volatile?
                                               #:graphic? graphic?
                                               #:disk-image-size
                                               (if full-boot?
@@ -772,6 +774,7 @@ and TARGET arguments."
                          dry-run? derivations-only?
                          use-substitutes? target
                          full-boot?
+                         volatile?
                          (graphic? #t)
                          container-shared-network?
                          (mappings '())
@@ -826,6 +829,7 @@ static checks."
   (mlet* %store-monad
       ((sys       (system-derivation-for-action image action
                                                 #:full-boot? full-boot?
+                                                #:volatile? volatile?
                                                 #:graphic? graphic?
                                                 #:container-shared-network? container-shared-network?
                                                 #:mappings mappings))
@@ -1277,6 +1281,7 @@ resulting from command-line parsing."
                                #:validate-reconfigure
                                (assoc-ref opts 'validate-reconfigure)
                                #:full-boot? (assoc-ref opts 'full-boot?)
+                               #:volatile? (assoc-ref opts 'volatile-root?)
                                #:graphic? (not (assoc-ref opts 'no-graphic?))
                                #:container-shared-network?
                                (assoc-ref opts 'container-shared-network?)