From: Danny Milosavljevic <dannym@scratchpost.org>
To: 27521@debbugs.gnu.org
Subject: [bug#27521] [PATCH] build: Allow specifying volume-uuid with make-iso9660-image.
Date: Mon, 3 Jul 2017 13:10:43 +0200 [thread overview]
Message-ID: <20170703111043.20712-1-dannym@scratchpost.org> (raw)
In-Reply-To: <878tk6rmvo.fsf@gnu.org>
* gnu/build/file-systems.scm (iso9660-uuid->string): Export.
* gnu/build/vm.scm (make-iso9660-image): Add volume-uuid.
---
gnu/build/file-systems.scm | 1 +
gnu/build/vm.scm | 19 ++++++++++++++-----
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 16160a659..b6930497d 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -48,6 +48,7 @@
string->ext3-uuid
string->ext4-uuid
string->btrfs-uuid
+ iso9660-uuid->string
bind-mount
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 860c98346..4239bc2fb 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -353,18 +353,27 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation."
(error "failed to create GRUB EFI image"))))
(define* (make-iso9660-image grub config-file os-drv target
- #:key (volume-id "GuixSD"))
+ #:key (volume-id "GuixSD") (volume-uuid #f))
"Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as
Grub configuration and OS-DRV as the stuff in it."
(let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue")))
(mkdir-p "/tmp/root/var/run")
(mkdir-p "/tmp/root/run")
- (unless (zero? (system* grub-mkrescue "-o" target
- (string-append "boot/grub/grub.cfg=" config-file)
- (string-append "gnu/store=" os-drv "/..")
+ (unless (zero? (apply system*
+ `(,grub-mkrescue "-o" ,target
+ ,(string-append "boot/grub/grub.cfg=" config-file)
+ ,(string-append "gnu/store=" os-drv "/..")
"var=/tmp/root/var"
"run=/tmp/root/run"
- "--" "-volid" (string-upcase volume-id)))
+ "--"
+ "-volid" ,(string-upcase volume-id)
+ ,@(if volume-uuid
+ `("-volume_date" "uuid"
+ ,(string-filter (lambda (value)
+ (not (char=? #\- value)))
+ (iso9660-uuid->string
+ volume-uuid)))
+ `()))))
(error "failed to create ISO image"))))
(define* (initialize-hard-disk device
next prev parent reply other threads:[~2017-07-03 11:11 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-28 22:03 [bug#27521] [PATCH] build: Add iso9660 system image generator Danny Milosavljevic
2017-06-28 22:22 ` [bug#27521] [PATCH v2] " Danny Milosavljevic
2017-06-28 22:48 ` [bug#27521] [PATCH v3] " Danny Milosavljevic
2017-06-29 2:09 ` [bug#27521] [PATCH v4] " Danny Milosavljevic
2017-06-29 13:47 ` [bug#27521] [PATCH v5] " Danny Milosavljevic
2017-06-30 10:13 ` Danny Milosavljevic
2017-07-02 14:55 ` Ludovic Courtès
2017-07-02 18:37 ` Danny Milosavljevic
2017-07-02 20:09 ` Ludovic Courtès
2017-07-02 22:01 ` Danny Milosavljevic
2017-07-03 7:38 ` Ludovic Courtès
2017-07-03 10:31 ` Danny Milosavljevic
2017-07-03 11:49 ` Ludovic Courtès
2017-07-03 10:34 ` [bug#27521] [PATCH] guix system: Add "--file-system-type" option Danny Milosavljevic
2017-07-03 11:56 ` Ludovic Courtès
2017-07-03 13:14 ` Danny Milosavljevic
2017-07-03 14:17 ` Ludovic Courtès
2017-07-03 14:20 ` Danny Milosavljevic
2017-07-03 15:31 ` Ludovic Courtès
2017-07-03 14:42 ` Danny Milosavljevic
2017-07-03 11:10 ` Danny Milosavljevic [this message]
2017-07-03 11:58 ` [bug#27521] [PATCH] build: Allow specifying volume-uuid with make-iso9660-image Ludovic Courtès
2017-06-29 3:17 ` [bug#27521] [PATCH] linux-initrd: Add isofs if necessary Danny Milosavljevic
2017-07-02 14:56 ` Ludovic Courtès
2017-07-02 18:28 ` Danny Milosavljevic
2017-07-03 18:02 ` [bug#27521] [PATCH] guix system: Add file system label and uuid to iso9660-image Danny Milosavljevic
2017-07-07 16:06 ` Danny Milosavljevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170703111043.20712-1-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=27521@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.