[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: scripts: system: Check the image operating-system.
From: |
guix-commits |
Subject: |
05/06: scripts: system: Check the image operating-system. |
Date: |
Tue, 30 Aug 2022 13:31:34 -0400 (EDT) |
mothacehe pushed a commit to branch master
in repository guix.
commit 6454164412ef8b0c5e5bd08b7b584cddd0784515
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Tue Aug 30 19:21:16 2022 +0200
scripts: system: Check the image operating-system.
* guix/scripts/system.scm (process-action): Check that the provided image
has
a defined operating-system.
---
guix/scripts/system.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 443e9d3282..4bcf789703 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -41,6 +41,7 @@
#:use-module (guix grafts)
#:use-module (guix gexp)
#:use-module (guix derivations)
+ #:use-module (guix diagnostics)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix monads)
@@ -1257,7 +1258,10 @@ resulting from command-line parsing."
(size image-size)
(volatile-root? volatile?)
(shared-network? shared-network?))))
- (os (image-operating-system image))
+ (os (or (image-operating-system image)
+ (raise
+ (formatted-message
+ (G_ "image lacks an operating-system")))))
(target-file (match args
((first second) second)
(_ #f)))
- branch master updated (db2444ad82 -> 73fb14c28a), guix-commits, 2022/08/30
- 01/06: build: image: Remove unused variable., guix-commits, 2022/08/30
- 03/06: image: Perform more sanitizing., guix-commits, 2022/08/30
- 05/06: scripts: system: Check the image operating-system.,
guix-commits <=
- 02/06: build: image: Make partition uuid optional., guix-commits, 2022/08/30
- 04/06: image: Remove an unused field., guix-commits, 2022/08/30
- 06/06: tests: image: New test., guix-commits, 2022/08/30