11/27: image: Support extra-directives, add hurd-directives.

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 7d7c2e4cb7717995d19453b545f4e44d39c2b647
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed May 27 13:15:46 2020 +0200

    image: Support extra-directives, add hurd-directives.
    
    * gnu/build/image.scm (initialize-root-partition): Add
    parameter '#:extra-directives' for populate root.
    * gnu/system/image.scm (system-disk-image): Likewise.
    (system-image): Use it to pass hurd-directives when bulding for the Hurd.
---
 gnu/build/image.scm  |  3 ++-
 gnu/system/image.scm | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/gnu/build/image.scm b/gnu/build/image.scm
index 70f1a61..2aecbfc 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -163,6 +163,7 @@ deduplicates files common to CLOSURE and the rest of 
PREFIX."
                                     system-directory
                                     (make-device-nodes
                                      make-essential-device-nodes)
+                                    (extra-directives '())
                                     #:allow-other-keys)
   "Initialize the given ROOT directory. Use BOOTCFG and BOOTCFG-LOCATION to
 install the bootloader configuration.
@@ -171,7 +172,7 @@ If REGISTER-CLOSURES? is true, register REFERENCES-GRAPHS 
in the store.  If
 DEDUPLICATE? is true, then also deduplicate files common to CLOSURES and the
 rest of the store when registering the closures. SYSTEM-DIRECTORY is the name
 of the directory of the 'system' derivation."
-  (populate-root-file-system system-directory root)
+  (populate-root-file-system system-directory root #:extras extra-directives)
   (populate-store references-graphs root)
 
   ;; Populate /dev.
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 15dac8a..0156969 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -202,6 +202,7 @@
                             bootcfg
                             bootloader
                             register-closures?
+                            (extra-directives '())
                             (inputs '()))
   "Return as a file-like object, the disk-image described by IMAGE.  Said
 image can be copied on a USB stick as is.  BOOTLOADER is the bootloader that
@@ -267,6 +268,7 @@ used in the image."
                               #:deduplicate? #f
                               #:system-directory #$os
                               #:grub-efi #+grub-efi
+                              #:extra-directives '#$extra-directives
                               #:bootloader-package
                               #+(bootloader-package bootloader)
                               #:bootloader-installer
@@ -526,15 +528,26 @@ image, depending on IMAGE format."
          (register-closures? (has-guix-service-type? os))
          (bootcfg (operating-system-bootcfg os))
          (bootloader (bootloader-configuration-bootloader
-                      (operating-system-bootloader os))))
+                      (operating-system-bootloader os)))
+         (hurd (operating-system-hurd os))
+         (boot-activation (and hurd (operating-system-activation-script os)))
+         (hurd-directives (if hurd
+                              `(("/hurd" -> ,(file-append hurd "/hurd"))
+                                (directory "/boot")
+                                ("/boot/activation" -> ,boot-activation))
+                              '())))
     (case (image-format image)
       ((disk-image)
        (system-disk-image image*
                           #:bootcfg bootcfg
                           #:bootloader bootloader
                           #:register-closures? register-closures?
+                          #:extra-directives hurd-directives
                           #:inputs `(("system" ,os)
-                                     ("bootcfg" ,bootcfg))))
+                                     ("bootcfg" ,bootcfg)
+                                     ,@(if hurd
+                                           `(("boot-activation" 
,boot-activation))
+                                           '()))))
       ((iso9660)
        (system-iso9660-image image*
                              #:bootcfg bootcfg