unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 70892@debbugs.gnu.org
Subject: [bug#70892] [PATCH 2/6] image: raise error when use both grub-efi* bootloader and not gpt image.
Date: Sun, 12 May 2024 19:09:25 +0800	[thread overview]
Message-ID: <3acf1c91714e59bcae87b9fea60062ba183e2542.1715508730.git.zhengjunjie@iscas.ac.cn> (raw)
In-Reply-To: <cover.1715508730.git.zhengjunjie@iscas.ac.cn>

* gnu/system/image.scm: Switch Inversion logic, it allow we use customize
bootloader with gpt image.

Change-Id: I801327f6e826a37588b8f0f5246ca820e742f721
---
 gnu/system/image.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 3082bcff46..b0c96c60f0 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -534,10 +534,10 @@ (define* (system-disk-image image
                 (image-partition-table-type image)))
        (else "")))
 
-    (when (and (gpt-image? image)
+    (when (and (memq (bootloader-name bootloader)
+                     '(grub-efi grub-efi32 grub-efi-removable-bootloader))
                (not
-                (memq (bootloader-name bootloader)
-                      '(grub-efi grub-efi32 grub-efi-removable-bootloader))))
+                (gpt-image? image)))
       (raise
        (formatted-message
         (G_ "EFI bootloader required with GPT partitioning"))))
-- 
2.41.0





  parent reply	other threads:[~2024-05-12 11:11 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-12 11:00 [bug#70892] [PATCH 0/6] Add visionfive2 support Zheng Junjie
2024-05-12 11:09 ` [bug#70892] [PATCH 1/6] gnu: linux-libre-6.8: add riscv config Zheng Junjie
2024-05-12 11:09 ` Zheng Junjie [this message]
2024-05-12 11:09 ` [bug#70892] [PATCH 3/6] gnu: shepherd-0.10: When target riscv64, use guile-fibers-1.1 Zheng Junjie
2024-05-12 11:09 ` [bug#70892] [PATCH 4/6] gnu: Add u-boot-starfive-visionfive2 Zheng Junjie
2024-05-15 17:59   ` Vagrant Cascadian
2024-05-18 17:58     ` Zheng Junjie
2024-05-12 11:09 ` [bug#70892] [PATCH 5/6] bootloader: Add u-boot-starfive-visionfive2-bootloader Zheng Junjie
2024-05-12 11:09 ` [bug#70892] [PATCH 6/6] system: images: Add visionfive2 module Zheng Junjie
2024-05-15 18:02 ` [bug#70892] [PATCH 0/6] Add visionfive2 support Vagrant Cascadian
2024-05-18 17:42 ` [bug#70892] [PATCH v2 0/7] " Zheng Junjie
2024-05-18 17:42   ` [bug#70892] [PATCH v2 1/7] gnu: linux-libre-6.8: add riscv config Zheng Junjie
2024-05-19 10:42     ` 宋文武 via Guix-patches via
2024-05-18 17:42   ` [bug#70892] [PATCH v2 2/7] image: raise error when use both grub-efi* bootloader and not gpt image Zheng Junjie
2024-05-18 17:43   ` [bug#70892] [PATCH v2 3/7] gnu: shepherd-0.10: When target riscv64, use guile-fibers-1.1 Zheng Junjie
2024-05-18 17:43   ` [bug#70892] [PATCH v2 4/7] gnu: Add opensbi-for-visionfive2 Zheng Junjie
2024-05-19 10:38     ` 宋文武 via Guix-patches via
2024-05-18 17:43   ` [bug#70892] [PATCH v2 5/7] gnu: Add u-boot-starfive-visionfive2 Zheng Junjie
2024-05-18 17:43   ` [bug#70892] [PATCH v2 6/7] bootloader: Add u-boot-starfive-visionfive2-bootloader Zheng Junjie
2024-05-18 17:43   ` [bug#70892] [PATCH v2 7/7] system: images: Add visionfive2 module Zheng Junjie
2024-05-19  9:33     ` 宋文武 via Guix-patches via
2024-05-19 14:15 ` [bug#70892] [PATCH v3 0/7] Add visionfive2 support Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 1/7] gnu: linux-libre-6.8: Add riscv config Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 2/7] image: Raise error when use both grub-efi* bootloader and not gpt image Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 3/7] gnu: shepherd-0.10: When target riscv64, use guile-fibers-1.1 Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 4/7] gnu: Add opensbi-for-visionfive2 Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 5/7] gnu: Add u-boot-starfive-visionfive2 Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 6/7] bootloader: Add u-boot-starfive-visionfive2-bootloader Zheng Junjie
2024-05-19 14:15   ` [bug#70892] [PATCH v3 7/7] system: images: Add visionfive2 module Zheng Junjie
2024-05-22  3:22   ` bug#70892: [PATCH v3 0/7] Add visionfive2 support Z572

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3acf1c91714e59bcae87b9fea60062ba183e2542.1715508730.git.zhengjunjie@iscas.ac.cn \
    --to=zhengjunjie@iscas.ac.cn \
    --cc=70892@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).