diff options
| -rw-r--r-- | sigils/bootloader/grub.scm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sigils/bootloader/grub.scm b/sigils/bootloader/grub.scm index 4c442ba..f969245 100644 --- a/sigils/bootloader/grub.scm +++ b/sigils/bootloader/grub.scm @@ -16,13 +16,14 @@ ;; Thanks to Rutherther (https://github.com/Rutherther/guix-config/blob/main/modules/ruther/bootloader/grub.scm) ;; for most of the implementation. -(define (grub-copy-configuration-file config entries . args) +(define* (grub-copy-configuration-file config entries . args) (let-keywords args #t ((locale #f) (system (%current-system)) - (old-entries '()) (store-crypto-devices '())) + (old-entries '())) - (let* ((grub (bootloader-package (bootloader-configuration-bootloader config))) + (let* ((args (append args '(#:store-crypto-devices ()))) + (grub (bootloader-package (bootloader-configuration-bootloader config))) (image ((@@ (gnu bootloader grub) grub-background-image) config)) (layout (bootloader-configuration-keyboard-layout config)) (locales (and locale ((@@ (gnu bootloader grub) grub-locale-directory) grub))) @@ -57,11 +58,7 @@ (display "insmod lvm\n" port) (display - ;; Let's get straight to the point. - (string-replace-substring - (call-with-input-file #$original-grub-cfg get-string-all) - "search --label --set rootfs" ;; to replace with something working on all systems - "search --label --set bootfs") + (call-with-input-file #$original-grub-cfg get-string-all) port) (display "\n\n" port) |