06/06: squash! image: Support extra-directives, add hurd-directives.

[guix-commits]

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

commit f48ede2bc1d0e92ad24f86633ef0de4a7f3078d5
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sat May 30 12:13:10 2020 +0200

    squash! image: Support extra-directives, add hurd-directives.
---
 gnu/system/image.scm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 0156969..76dfbc1 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -530,12 +530,8 @@ image, depending on IMAGE format."
          (bootloader (bootloader-configuration-bootloader
                       (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))
-                              '())))
+                              `(("/hurd" -> ,(file-append hurd "/hurd"))))))
     (case (image-format image)
       ((disk-image)
        (system-disk-image image*
@@ -544,10 +540,7 @@ image, depending on IMAGE format."
                           #:register-closures? register-closures?
                           #:extra-directives hurd-directives
                           #:inputs `(("system" ,os)
-                                     ("bootcfg" ,bootcfg)
-                                     ,@(if hurd
-                                           `(("boot-activation" 
,boot-activation))
-                                           '()))))
+                                     ("bootcfg" ,bootcfg))))
       ((iso9660)
        (system-iso9660-image image*
                              #:bootcfg bootcfg