me/guix
Archived
1
0
Fork 0
Code Activity

vm: Add support for registering closures to make-iso9660-image.

Browse source 
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.
This commit is contained in:
Christopher Baines 2017-09-03 11:47:58 +01:00
parent f1597427f2
commit 22bbdb5f79
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/build/vm.scm
View file

@ -366,12 +366,27 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation."
(error "failed to create GRUB EFI image")))) (error "failed to create GRUB EFI image"))))
(define* (make-iso9660-image grub config-file os-drv target (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 "Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as
GRUB configuration and OS-DRV as the stuff in it." 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/var/run")
(mkdir-p "/tmp/root/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* (unless (zero? (apply system*
`(,grub-mkrescue "-o" ,target `(,grub-mkrescue "-o" ,target
,(string-append "boot/grub/grub.cfg=" config-file) ,(string-append "boot/grub/grub.cfg=" config-file)