diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2025-11-10 18:02:25 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2025-11-26 13:17:38 +0200 |
| commit | 1dfe1ebdf6399256b5ed9f2d6e77722aceaae07d (patch) | |
| tree | f7ac52642417b7c9f9bcd6ebe9ea8c7fc7de6c89 /gnu/system | |
| parent | 5df3514ab0fe36915539c93023f444194087388c (diff) | |
system: image: Don't add grub-efi to the build closure unless needed.
* gnu/system/image.scm (system-disk-image)[partition-image]: In the
initializer don't unconditionally refer to grub-efi and grub-efi32
unless they might be needed.
Change-Id: I6eca21e162c233cd57e840a525788af831ad6b6b
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/image.scm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm index e272911d2fa..5e43eb861f4 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2022 Pavel Shlyak <p.shlyak@pantherx.org> ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2022 Alex Griffin <a@ajgrf.com> -;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2023, 2025 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2023 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -497,8 +497,15 @@ used in the image." #:copy-closures? (not #$(image-shared-store? image)) #:system-directory #$os - #:grub-efi #+grub-efi - #:grub-efi32 #+grub-efi32 + ;; These two shouldn't be needed unconditionally. + #:grub-efi + #+(if (bootloader-uses-grub-efi? bootloader) + grub-efi + #f) + #:grub-efi32 + #+(if (bootloader-uses-grub-efi? bootloader) + grub-efi32 + #f) #:bootloader-package #+(bootloader-package bootloader) #:bootloader-installer |