diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2020-05-23 19:09:53 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-05-29 08:40:03 +0200 |
| commit | 9c1adb240016261d6263e8d7d0308040542f3c60 (patch) | |
| tree | 85745d8771e0135b7ab574fab0677044ae34a84d | |
| parent | 7202895e5afa9922ba06eaba295645b08d6fd254 (diff) | |
| download | guix-9c1adb240016261d6263e8d7d0308040542f3c60.tar.gz | |
image: Add bootloader installation support.
* gnu/build/image.scm (initialize-root-partition): Add bootloader-package and bootloader-installer arguments. Run the bootloader-installer if defined. * gnu/system/image.scm (system-disk-image): Adapt the partition initializer call accordingly.
| -rw-r--r-- | gnu/build/image.scm | 5 | ||||
| -rw-r--r-- | gnu/system/image.scm | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gnu/build/image.scm b/gnu/build/image.scm index b37ea9332a..49faeab466 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -155,6 +155,8 @@ deduplicates files common to CLOSURE and the rest of PREFIX." #:key bootcfg bootcfg-location + bootloader-package + bootloader-installer (deduplicate? #t) references-graphs (register-closures? #t) @@ -178,6 +180,9 @@ of the directory of the 'system' derivation." #:deduplicate? deduplicate?)) references-graphs)) + (when bootloader-installer + (display "installing bootloader...\n") + (bootloader-installer bootloader-package #f root)) (when bootcfg (install-boot-config bootcfg bootcfg-location root))) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 92b3f4424e..ece2d02f51 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -235,7 +235,9 @@ used in the image." #:deduplicate? #f #:system-directory #$os #:bootloader-package - #$(bootloader-package bootloader) + #+(bootloader-package bootloader) + #:bootloader-installer + #+(bootloader-installer bootloader) #:bootcfg #$bootcfg #:bootcfg-location #$(bootloader-configuration-file bootloader))))) |