ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bootloader: extlinux: Stop using dd binary.

Browse source 
* gnu/bootloader/extlinux.scm (dd): Remove it,
(install-extlinux): replace dd call by Guile I/O procedures.
* gnu/system/vm.scm (qemu-image): Add (ice-9 binary-ports) to used-modules
list to provide "get-bytevector-n" and "put-bytevector".
* guix/scripts/system.scm (bootloader-installer-derivation): Ditto.
This commit is contained in:
Mathieu Othacehe 2017-12-01 14:09:38 +01:00
parent 39b27f4eae
commit 4307397b5e
No known key found for this signature in database
GPG key ID: 8354763531769CA6
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/bootloader/extlinux.scm
View file

@ -85,14 +85,6 @@ (define builder
;;; Install procedures. ;;; Install procedures.
;;; ;;;
(define dd
#~(lambda (bs count if of)
(zero? (system* "dd"
(string-append "bs=" (number->string bs))
(string-append "count=" (number->string count))
(string-append "if=" if)
(string-append "of=" of)))))
(define (install-extlinux mbr) (define (install-extlinux mbr)
#~(lambda (bootloader device mount-point) #~(lambda (bootloader device mount-point)
(let ((extlinux (string-append bootloader "/sbin/extlinux")) (let ((extlinux (string-append bootloader "/sbin/extlinux"))
@ -101,9 +93,15 @@ (define (install-extlinux mbr)
(for-each (lambda (file) (for-each (lambda (file)
(install-file file install-dir)) (install-file file install-dir))
(find-files syslinux-dir "\\.c32$")) (find-files syslinux-dir "\\.c32$"))
(unless
(unless (and (zero? (system* extlinux "--install" install-dir)) (and (zero? (system* extlinux "--install" install-dir))
(#$dd 440 1 (string-append syslinux-dir "/" #$mbr) device)) (call-with-input-file (string-append syslinux-dir "/" #$mbr)
(lambda (input)
(let ((bv (get-bytevector-n input 440)))
(call-with-output-file device
(lambda (output)
(put-bytevector output bv))
#:binary #t)))))
(error "failed to install SYSLINUX"))))) (error "failed to install SYSLINUX")))))
(define install-extlinux-mbr (define install-extlinux-mbr

3
gnu/system/vm.scm
View file

@ -278,7 +278,8 @@ (define* (qemu-image #:key
#~(begin #~(begin
(use-modules (gnu build vm) (use-modules (gnu build vm)
(guix build utils) (guix build utils)
(srfi srfi-26)) (srfi srfi-26)
(ice-9 binary-ports))
(let ((inputs (let ((inputs
'#$(append (list qemu parted e2fsprogs dosfstools) '#$(append (list qemu parted e2fsprogs dosfstools)

3
guix/scripts/system.scm
View file

@ -676,7 +676,8 @@ (define (bootloader-installer-derivation installer
(gexp->file "bootloader-installer" (gexp->file "bootloader-installer"
(with-imported-modules '((guix build utils)) (with-imported-modules '((guix build utils))
#~(begin #~(begin
(use-modules (guix build utils)) (use-modules (guix build utils)
(ice-9 binary-ports))
(#$installer #$bootloader #$device #$target)))))) (#$installer #$bootloader #$device #$target))))))
(define* (perform-action action os (define* (perform-action action os