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.
This commit is contained in:
		
							parent
							
								
									3ed8ddd606
								
							
						
					
					
						commit
						c37cd41764
					
				
					 1 changed files with 5 additions and 0 deletions
				
			
		| 
						 | 
					@ -689,6 +689,7 @@ checking this by themselves in their 'check' procedure."
 | 
				
			||||||
(define* (system-derivation-for-action image action
 | 
					(define* (system-derivation-for-action image action
 | 
				
			||||||
                                       #:key
 | 
					                                       #:key
 | 
				
			||||||
                                       full-boot?
 | 
					                                       full-boot?
 | 
				
			||||||
 | 
					                                       volatile?
 | 
				
			||||||
                                       (graphic? #t)
 | 
					                                       (graphic? #t)
 | 
				
			||||||
                                       container-shared-network?
 | 
					                                       container-shared-network?
 | 
				
			||||||
                                       mappings)
 | 
					                                       mappings)
 | 
				
			||||||
| 
						 | 
					@ -707,6 +708,7 @@ checking this by themselves in their 'check' procedure."
 | 
				
			||||||
      ((vm)
 | 
					      ((vm)
 | 
				
			||||||
       (system-qemu-image/shared-store-script os
 | 
					       (system-qemu-image/shared-store-script os
 | 
				
			||||||
                                              #:full-boot? full-boot?
 | 
					                                              #:full-boot? full-boot?
 | 
				
			||||||
 | 
					                                              #:volatile? volatile?
 | 
				
			||||||
                                              #:graphic? graphic?
 | 
					                                              #:graphic? graphic?
 | 
				
			||||||
                                              #:disk-image-size
 | 
					                                              #:disk-image-size
 | 
				
			||||||
                                              (if full-boot?
 | 
					                                              (if full-boot?
 | 
				
			||||||
| 
						 | 
					@ -772,6 +774,7 @@ and TARGET arguments."
 | 
				
			||||||
                         dry-run? derivations-only?
 | 
					                         dry-run? derivations-only?
 | 
				
			||||||
                         use-substitutes? target
 | 
					                         use-substitutes? target
 | 
				
			||||||
                         full-boot?
 | 
					                         full-boot?
 | 
				
			||||||
 | 
					                         volatile?
 | 
				
			||||||
                         (graphic? #t)
 | 
					                         (graphic? #t)
 | 
				
			||||||
                         container-shared-network?
 | 
					                         container-shared-network?
 | 
				
			||||||
                         (mappings '())
 | 
					                         (mappings '())
 | 
				
			||||||
| 
						 | 
					@ -826,6 +829,7 @@ static checks."
 | 
				
			||||||
  (mlet* %store-monad
 | 
					  (mlet* %store-monad
 | 
				
			||||||
      ((sys       (system-derivation-for-action image action
 | 
					      ((sys       (system-derivation-for-action image action
 | 
				
			||||||
                                                #:full-boot? full-boot?
 | 
					                                                #:full-boot? full-boot?
 | 
				
			||||||
 | 
					                                                #:volatile? volatile?
 | 
				
			||||||
                                                #:graphic? graphic?
 | 
					                                                #:graphic? graphic?
 | 
				
			||||||
                                                #:container-shared-network? container-shared-network?
 | 
					                                                #:container-shared-network? container-shared-network?
 | 
				
			||||||
                                                #:mappings mappings))
 | 
					                                                #:mappings mappings))
 | 
				
			||||||
| 
						 | 
					@ -1277,6 +1281,7 @@ resulting from command-line parsing."
 | 
				
			||||||
                               #:validate-reconfigure
 | 
					                               #:validate-reconfigure
 | 
				
			||||||
                               (assoc-ref opts 'validate-reconfigure)
 | 
					                               (assoc-ref opts 'validate-reconfigure)
 | 
				
			||||||
                               #:full-boot? (assoc-ref opts 'full-boot?)
 | 
					                               #:full-boot? (assoc-ref opts 'full-boot?)
 | 
				
			||||||
 | 
					                               #:volatile? (assoc-ref opts 'volatile-root?)
 | 
				
			||||||
                               #:graphic? (not (assoc-ref opts 'no-graphic?))
 | 
					                               #:graphic? (not (assoc-ref opts 'no-graphic?))
 | 
				
			||||||
                               #:container-shared-network?
 | 
					                               #:container-shared-network?
 | 
				
			||||||
                               (assoc-ref opts 'container-shared-network?)
 | 
					                               (assoc-ref opts 'container-shared-network?)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue