[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: system: image: Use the image name as the disk-ima
From: |
guix-commits |
Subject: |
branch master updated: system: image: Use the image name as the disk-image derivation name. |
Date: |
Fri, 26 Jun 2020 03:38:31 -0400 |
This is an automated email from the git hooks/post-receive script.
mothacehe pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 5980ec8 system: image: Use the image name as the disk-image
derivation name.
5980ec8 is described below
commit 5980ec8ada5ede54bde6558c7ab8bf492bc70f85
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Fri Jun 26 09:04:43 2020 +0200
system: image: Use the image name as the disk-image derivation name.
* gnu/system/image.scm (system-disk-image): Use the image name as disk-image
derivation name, if defined. Otherwise use the generic "disk-image" name.
---
gnu/system/image.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index a4cc2d1..7efbc9f 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -301,7 +301,8 @@ image ~a {
}~%" #$genimage-name #$image-type (list #$@partitions-config))))))))
(computed-file "genimage.cfg" builder)))
- (let* ((substitutable? (image-substitutable? image))
+ (let* ((name (or (image-name image) name))
+ (substitutable? (image-substitutable? image))
(builder
(with-imported-modules*
(let ((inputs '#+(list genimage coreutils findutils))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: system: image: Use the image name as the disk-image derivation name.,
guix-commits <=