summaryrefslogtreecommitdiff
path: root/gnu/build
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2017-09-03 11:47:58 +0100
committerChristopher Baines <mail@cbaines.net>2017-09-06 08:43:38 +0100
commit22bbdb5f794c9fe2f350f4295b8dcf93438ad011 (patch)
treed4bf9f67baa86000e410f5fc4beb3ae2af13af2f /gnu/build
parentf1597427f220b0799b9c8847768d2f5a93fe3730 (diff)
downloadpatches-22bbdb5f794c9fe2f350f4295b8dcf93438ad011.tar
patches-22bbdb5f794c9fe2f350f4295b8dcf93438ad011.tar.gz
vm: Add support for registering closures to make-iso9660-image.
This mimics the functionality in the root-partition-initializer used in creating the QEMU image. This helps when trying to run guix system init from the generated ISO image. * gnu/build/vm.scm (make-iso9660-image): Add support for registering closures.
Diffstat (limited to 'gnu/build')
-rw-r--r--gnu/build/vm.scm19
1 files changed, 17 insertions, 2 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 727494ad93..606257d8c3 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")
+
+ (mkdir-p target-store)
+ (mount (%store-directory) target-store "" MS_BIND)
+
+ (when register-closures?
+ (display "registering closures...\n")
+ (for-each (lambda (closure)
+ (register-closure
+ "/tmp/root"
+ (string-append "/xchg/" closure)
+ #:deduplicate? #f))
+ closures))
+
(unless (zero? (apply system*
`(,grub-mkrescue "-o" ,target
,(string-append "boot/grub/grub.cfg=" config-file)