diff options
Diffstat (limited to 'gnu/bootloader')
| -rw-r--r-- | gnu/bootloader/grub.scm | 26 | ||||
| -rw-r--r-- | gnu/bootloader/u-boot.scm | 9 |
2 files changed, 14 insertions, 21 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 29c81ae641..13ee695909 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -168,15 +168,14 @@ STORE-DEVICE designates the device holding the store, and STORE-MOUNT-POINT is its mount point; these are used to determine where the background image and fonts must be searched for. STORE-DIRECTORY-PREFIX is a directory prefix to prepend to any store file name." - (define (setup-gfxterm config font-file) + (define (setup-gfxterm config) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs config)) #~(format #f " -if loadfont ~a; then +if loadfont unicode; then set gfxmode=~a insmod all_video insmod gfxterm fi~%" - #+font-file #$(string-join (grub-theme-gfxmode (bootloader-theme config)) ";")) @@ -188,13 +187,6 @@ fi~%" (string-append (symbol->string (assoc-ref colors 'fg)) "/" (symbol->string (assoc-ref colors 'bg))))) - (define font-file - (let* ((bootloader (bootloader-configuration-bootloader config)) - (grub (bootloader-package bootloader))) - (normalize-file (file-append grub "/share/grub/unicode.pf2") - store-mount-point - store-directory-prefix))) - (define image (normalize-file (grub-background-image config) store-mount-point @@ -216,8 +208,8 @@ else set menu_color_normal=cyan/blue set menu_color_highlight=white/blue fi~%" - #$(grub-root-search store-device font-file) - #$(setup-gfxterm config font-file) + #$(grub-root-search store-device image) + #$(setup-gfxterm config) #$(grub-setup-io config) #$image @@ -545,9 +537,13 @@ fi~%")))) (invoke/quiet grub "--no-floppy" "--target=i386-pc" "--boot-directory" install-dir device)) - ;; When creating a disk-image, only install GRUB modules. - (copy-recursively (string-append bootloader "/lib/") - install-dir))))) + ;; When creating a disk-image, only install a font and GRUB modules. + (let* ((fonts (string-append install-dir "/grub/fonts"))) + (mkdir-p fonts) + (copy-file (string-append bootloader "/share/grub/unicode.pf2") + (string-append fonts "/unicode.pf2")) + (copy-recursively (string-append bootloader "/lib/") + install-dir)))))) (define install-grub-disk-image #~(lambda (bootloader root-index image) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index c57d4964c8..122c7c9861 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -73,12 +73,9 @@ (define install-allwinner64-u-boot #~(lambda (bootloader root-index image) - (let ((spl (string-append bootloader "/libexec/spl/sunxi-spl.bin")) - (u-boot (string-append bootloader "/libexec/u-boot.itb"))) + (let ((spl (string-append bootloader "/libexec/u-boot-sunxi-with-spl.fit.itb"))) (write-file-on-device spl (stat:size (stat spl)) - image (* 8 1024)) - (write-file-on-device u-boot (stat:size (stat u-boot)) - image (* 40 1024))))) + image (* 8 1024))))) (define install-imx-u-boot #~(lambda (bootloader root-index image) @@ -91,7 +88,7 @@ (define install-puma-rk3399-u-boot #~(lambda (bootloader root-index image) - (let ((spl (string-append bootloader "/libexec/u-boot-spl.rksd")) + (let ((spl (string-append bootloader "/libexec/idbloader.img")) (u-boot (string-append bootloader "/libexec/u-boot.itb"))) (write-file-on-device spl (stat:size (stat spl)) image (* 64 512)) |