~ruther/guix-local: image: operating-system-for-image: Support AArch64 iso.

2576c66e4725d6829e602c15f8f95861a36fe383 — Rutherther 5 months ago bb22631

image: operating-system-for-image: Support AArch64 iso.

Let the user decide for grub/grub-efi in cases where
grub-hybrid is unsupported. This is the case on
aarch64, where grub-pc is not supported, so only
grub-efi can be used.

* gnu/system/image.scm (operating-system-for-image):
Do not replace bootloader with grub-mkrescue-bootloader
for iso9660 when grub-hybrid is not supported.

Change-Id: Icd2b68155935b1d9599c1b0df22f0c80a2e36d6a
Signed-off-by: Rutherther <rutherther@ditigal.xyz>

patch browse .tar.gz

1 files changed, 9 insertions(+), 4 deletions(-)

M gnu/system/image.scm

M gnu/system/image.scm => gnu/system/image.scm +9 -4

@@ 985,11 985,16 @@ it can be used for bootloading."
                              file-systems
                              #:volatile-root? volatile-root?
                              rest)))
-            (bootloader (if (eq? format 'iso9660)
+            ;; Only replace with grub-mkrescue-bootloader if grub-pc
+            ;; is supported. AArch64 doesn't support it.  In such
+            ;; cases, respect bootloader of the system.  Still,
+            ;; for now make-iso9660-image installs only GRUB.
+            (bootloader (if (and (eq? format 'iso9660)
+                                 (supported-package? grub-hybrid))
                             (bootloader-configuration
-                             (inherit
-                              (operating-system-bootloader base-os))
-                             (bootloader grub-mkrescue-bootloader))
+                              (inherit
+                               (operating-system-bootloader base-os))
+                              (bootloader grub-mkrescue-bootloader))
                             (operating-system-bootloader base-os)))
             (file-systems (cons (file-system
                                   (mount-point "/")