From: Christopher Baines <mail@cbaines.net>
To: 28288@debbugs.gnu.org
Subject: [bug#28288] [PATCH 2/2] WIP
Date: Wed, 30 Aug 2017 07:20:10 +0100 [thread overview]
Message-ID: <20170830062010.11902-2-mail@cbaines.net> (raw)
In-Reply-To: <20170830062010.11902-1-mail@cbaines.net>
---
gnu/build/vm.scm | 19 +++++++++++++++++--
gnu/system/vm.scm | 16 +++++++++++-----
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 727494ad9..e2659cb5e 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -366,12 +366,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_image") (volume-uuid #f))
+ #:key (volume-id "GuixSD_image") (volume-uuid #f)
+ register-closures? (closures '()))
"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")))
+ (let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue"))
+ (target-store (string-append "/tmp/root" (%store-directory))))
(mkdir-p "/tmp/root/var/run")
(mkdir-p "/tmp/root/run")
+
+ ;; XXX: 'guix-register' wants to palpate the things it registers, so
+ ;; bind-mount the store on the target.
+ (mkdir-p target-store)
+ (mount (%store-directory) target-store "" MS_BIND)
+
+ (when register-closures?
+ (display "registering closures...\n")
+ (for-each (lambda (closure)
+ (register-closure target
+ (string-append "/xchg/" closure)))
+ closures))
+
(unless (zero? (apply system*
`(,grub-mkrescue "-o" ,target
,(string-append "boot/grub/grub.cfg=" config-file)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 4494af003..b106dff0a 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -192,6 +192,7 @@ made available under the /xchg CIFS share."
os-drv
bootcfg-drv
bootloader
+ register-closures?
(inputs '()))
"Return a bootable, stand-alone iso9660 image.
@@ -207,8 +208,13 @@ INPUTS is a list of inputs (as for packages)."
(let ((inputs
'#$(append (list qemu parted e2fsprogs dosfstools xorriso)
(map canonical-package
- (list sed grep coreutils findutils gawk))))
+ (list sed grep coreutils findutils gawk))
+ (if register-closures? (list guix) '())))
+
+ (graphs '#$(match inputs
+ (((names . _) ...)
+ names)))
;; This variable is unused but allows us to add INPUTS-TO-COPY
;; as inputs.
(to-register
@@ -222,6 +228,8 @@ INPUTS is a list of inputs (as for packages)."
#$bootcfg-drv
#$os-drv
"/xchg/guixsd.iso"
+ #:register-closures? #$register-closures?
+ #:closures graphs
#:volume-id #$file-system-label
#:volume-uuid #$file-system-uuid)
(reboot))))
@@ -391,6 +399,7 @@ to USB sticks meant to be read-only."
#:file-system-label root-label
#:file-system-uuid #f
#:os-drv os-drv
+ #:register-closures? #t
#:bootcfg-drv bootcfg
#:bootloader (bootloader-configuration-bootloader
(operating-system-bootloader os))
@@ -403,10 +412,7 @@ to USB sticks meant to be read-only."
(operating-system-bootloader os))
#:disk-image-size disk-image-size
#:disk-image-format "raw"
- #:file-system-type (if (string=? "iso9660"
- file-system-type)
- "ext4"
- file-system-type)
+ #:file-system-type file-system-type
#:file-system-label root-label
#:copy-inputs? #t
#:register-closures? #t
--
2.14.1
next prev parent reply other threads:[~2017-08-30 6:21 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-30 6:17 [bug#28288] [PATCH] Test and fix the ISO Image Installer Christopher Baines
2017-08-30 6:20 ` [bug#28288] [PATCH 1/2] tests: Add test for installing from an ISO Image Christopher Baines
2017-08-30 6:20 ` Christopher Baines [this message]
2017-08-30 6:31 ` [bug#28288] [PATCH 2/2] WIP Christopher Baines
2017-08-30 8:38 ` Danny Milosavljevic
2017-08-30 22:56 ` Christopher Baines
2017-08-31 13:04 ` Danny Milosavljevic
2017-08-31 21:47 ` Christopher Baines
2017-08-30 18:26 ` Danny Milosavljevic
2017-09-03 10:50 ` [bug#28288] [PATCH 1/5] vm: Add support for registering closures to make-iso9660-image Christopher Baines
2017-09-03 10:50 ` [bug#28288] [PATCH 2/5] vm: Create /mnt in the generated ISO image in make-iso9660-image Christopher Baines
2017-09-05 12:58 ` Danny Milosavljevic
2017-09-03 10:50 ` [bug#28288] [PATCH 3/5] vm: Add support for registering closures to iso9660-image Christopher Baines
2017-09-05 12:57 ` Danny Milosavljevic
2017-09-03 10:50 ` [bug#28288] [PATCH 4/5] vm: Call iso9660-image with #:register-closures? as #t Christopher Baines
2017-09-05 12:56 ` Danny Milosavljevic
2017-09-05 13:18 ` Ludovic Courtès
2017-09-03 10:50 ` [bug#28288] [PATCH 5/5] tests: Add test for installing from an ISO Image Christopher Baines
2017-09-03 10:58 ` Christopher Baines
2017-09-05 13:18 ` Ludovic Courtès
2017-09-06 7:46 ` bug#28288: " Christopher Baines
2017-09-05 13:17 ` [bug#28288] [PATCH 1/5] vm: Add support for registering closures to make-iso9660-image Ludovic Courtès
2017-09-06 7:05 ` Christopher Baines
2017-09-06 13:20 ` Ludovic Courtès
2017-09-10 10:45 ` Christopher Baines
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170830062010.11902-2-mail@cbaines.net \
--to=mail@cbaines.net \
--cc=28288@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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).