summary refs log tree commit diff
path: root/gnu/system
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2020-10-05 10:58:55 +0200
committerMathieu Othacehe <othacehe@gnu.org>2020-10-05 11:10:35 +0200
commitb97b423e3f61c80d5877dadc95b3f316cd61788f (patch)
treeb0ba2a1458875c8e33e1430a0e04dad14ca833d8 /gnu/system
parent525a351efaea52dbd4f93321a490397ebeb2130f (diff)
downloadguix-b97b423e3f61c80d5877dadc95b3f316cd61788f.tar.gz
bootloader: Fix u-boot installation.
This is a follow-up of f19cf27c2b9ff92e2c0fd931ef7fde39c376adaa. The
bootloader installation must be done on the final disk-image, hence using
"disk-image-installer" instead of "installer" callback.

* gnu/bootloader/u-boot.scm: Turn all installer callbacks into
disk-image-installer callbacks.
* gnu/build/bootloader.scm (write-file-on-device): Open the output file with
'no-truncate and 'no-create options.
* gnu/system/image.scm (with-imported-modules*): Add (gnu build bootloader)
module.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/image.scm2
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index d8d5882a54..2aa6c2ef13 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -202,6 +202,7 @@ set to the given OS."
     (with-imported-modules `(,@(source-module-closure
                                 '((gnu build vm)
                                   (gnu build image)
+                                  (gnu build bootloader)
                                   (gnu build hurd-boot)
                                   (gnu build linux-boot)
                                   (guix store database))
@@ -210,6 +211,7 @@ set to the given OS."
       #~(begin
           (use-modules (gnu build vm)
                        (gnu build image)
+                       (gnu build bootloader)
                        (gnu build hurd-boot)
                        (gnu build linux-boot)
                        (guix store database)