[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: guix system: Use "image.iso" as the name of ISO images.
From: |
Ludovic Courtès |
Subject: |
02/03: guix system: Use "image.iso" as the name of ISO images. |
Date: |
Tue, 18 Jul 2017 16:55:51 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 5058bf56843baf3c0d82fbf0addbb30f00572428
Author: Ludovic Courtès <address@hidden>
Date: Tue Jul 18 21:39:56 2017 +0200
guix system: Use "image.iso" as the name of ISO images.
* guix/scripts/system.scm (system-derivation-for-action): Pass #:name to
'system-disk-image'.
---
guix/scripts/system.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 65dd92e..0fcb6a9 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -579,8 +579,12 @@ PATTERN, a string. When PATTERN is #f, display all the
system generations."
(* 70 (expt 2 20)))
#:mappings mappings))
((disk-image)
- (system-disk-image os #:disk-image-size image-size
- #:file-system-type file-system-type))))
+ (system-disk-image os
+ #:name (match file-system-type
+ ("iso9660" "image.iso")
+ (_ "disk-image"))
+ #:disk-image-size image-size
+ #:file-system-type file-system-type))))
(define (maybe-suggest-running-guix-pull)
"Suggest running 'guix pull' if this has never been done before."