diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-12-05 12:59:15 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-12-15 11:52:38 +0100 |
| commit | e22482038611a53a9d2b25df20363664cd91be2e (patch) | |
| tree | da53181cdbbe40b8035fdc577b0767e8055c9681 /gnu/bootloader/extlinux.scm | |
| parent | acf54bca225b63f5b06e335a55045421c47bbd09 (diff) | |
bootloader: Factorize write-file-on-device.
* gnu/bootloader/extlinux.scm (install-extlinux): Factorize bootloader
writing in a new procedure write-file-on-device defined in (gnu build
bootloader).
* gnu/build/bootloader.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add new file.
* gnu/system/vm.scm (qemu-img): Adapt to import and use (gnu build bootloader)
module during derivation building.
* gnu/scripts/system.scm (bootloader-installer-derivation): Ditto.
Diffstat (limited to 'gnu/bootloader/extlinux.scm')
| -rw-r--r-- | gnu/bootloader/extlinux.scm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm index 9b6e2c7f2a2..f7820a37a48 100644 --- a/gnu/bootloader/extlinux.scm +++ b/gnu/bootloader/extlinux.scm | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | (define-module (gnu bootloader extlinux) | 20 | (define-module (gnu bootloader extlinux) |
| 21 | #:use-module (gnu bootloader) | 21 | #:use-module (gnu bootloader) |
| 22 | #:use-module (gnu system) | 22 | #:use-module (gnu system) |
| 23 | #:use-module (gnu build bootloader) | ||
| 23 | #:use-module (gnu packages bootloaders) | 24 | #:use-module (gnu packages bootloaders) |
| 24 | #:use-module (guix gexp) | 25 | #:use-module (guix gexp) |
| 25 | #:use-module (guix monads) | 26 | #:use-module (guix monads) |
| @@ -95,13 +96,8 @@ TIMEOUT ~a~%" | |||
| 95 | (find-files syslinux-dir "\\.c32$")) | 96 | (find-files syslinux-dir "\\.c32$")) |
| 96 | (unless | 97 | (unless |
| 97 | (and (zero? (system* extlinux "--install" install-dir)) | 98 | (and (zero? (system* extlinux "--install" install-dir)) |
| 98 | (call-with-input-file (string-append syslinux-dir "/" #$mbr) | 99 | (write-file-on-device |
| 99 | (lambda (input) | 100 | (string-append syslinux-dir "/" #$mbr) 440 device 0)) |
| 100 | (let ((bv (get-bytevector-n input 440))) | ||
| 101 | (call-with-output-file device | ||
| 102 | (lambda (output) | ||
| 103 | (put-bytevector output bv)) | ||
| 104 | #:binary #t))))) | ||
| 105 | (error "failed to install SYSLINUX"))))) | 101 | (error "failed to install SYSLINUX"))))) |
| 106 | 102 | ||
| 107 | (define install-extlinux-mbr | 103 | (define install-extlinux-mbr |
