unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Christopher Baines <mail@cbaines.net>
To: 28288@debbugs.gnu.org
Subject: [bug#28288] [PATCH 1/5] vm: Add support for registering closures to make-iso9660-image.
Date: Sun,  3 Sep 2017 11:50:37 +0100	[thread overview]
Message-ID: <20170903105041.2925-1-mail@cbaines.net> (raw)
In-Reply-To: <20170830071714.75f88e47@cbaines.net>

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.
---
 gnu/build/vm.scm | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 727494ad9..606257d8c 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)
-- 
2.14.1

  parent reply	other threads:[~2017-09-03 10:51 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   ` [bug#28288] [PATCH 2/2] WIP Christopher Baines
2017-08-30  6:31     ` 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 ` Christopher Baines [this message]
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=20170903105041.2925-1-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).