From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id ULyeE+gJSmb8FAEAqHPOHw:P1 (envelope-from ) for ; Sun, 19 May 2024 16:17:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id ULyeE+gJSmb8FAEAqHPOHw (envelope-from ) for ; Sun, 19 May 2024 16:17:12 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1716128232; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=tJcDVCD++LAPSZpvtYxWPUJK6yyyTK5GxC8lCwidgTM=; b=lybHshP6gCZU63tE18ygFJj1+Gg6xf2yqXD+L73NWRNtVyz0Zj7bmIcJkYhTyWOmta2p1y 8qgrMpqjB/hDxpajRJWU04DrHDFS7r9nVbl91KQdhvArxlben6+2ZUv1gE2AzOwVb/m4WY 1WGWsd4sciB+OwqDH9eRu0NKIe1OAE02sxjhaBxzfiHGN6kjr68Wyx+8IHi5sderxEqVv8 tNqq/0jf9diymbH7Se/VaprsieMs0bGgHNUafE7mud+qGJQPrslXOlCUuy0CW8ceqQyA4H RzDPg5agpkv1bVDZ9m0RqMZBRjnxJkhID6FQ4GY2UANdIZ82okkqNUElO03OvQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716128232; a=rsa-sha256; cv=none; b=uuoCJ/f2CBaRRRDRC2oi6B0TDR846wOPCnTPdV4sByfMOA4vSsMu1oGFxdA534ODcb9wsi GkSUfyR/j7kDQYDDVT7VLDYiTLTtvnVx/ZAmslbDW9zwJQjdAxMk/ne1rehYjhnHNsCCzY 3uAR+OB/vCWUXgLJt4qURPYIiAdUrkNPnrdNP1EnF9r7HDkCay8nltVklty0pohSUgACQA imM1H7n7uGZdwY9t3RoYPiN8JRgrS0kBRUKsOg0OR86QmIhemt13qs017J8WIUo4UL+Bx4 OH1WZXCj2DBrtIM0UU+jxypln4XqeA3x4fXw79WtaxbqoSt7Pukp1e6SbG/mUw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0563F266EF for ; Sun, 19 May 2024 16:17:10 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s8hLS-0007e2-VW; Sun, 19 May 2024 10:17:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s8hLP-0007cq-Q4 for guix-patches@gnu.org; Sun, 19 May 2024 10:17:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s8hLP-00067I-GG for guix-patches@gnu.org; Sun, 19 May 2024 10:16:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s8hLT-0001a6-GV for guix-patches@gnu.org; Sun, 19 May 2024 10:17:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70892] [PATCH v3 2/7] image: Raise error when use both grub-efi* bootloader and not gpt image. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 May 2024 14:17:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70892 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70892@debbugs.gnu.org Received: via spool by 70892-submit@debbugs.gnu.org id=B70892.17161282085995 (code B ref 70892); Sun, 19 May 2024 14:17:03 +0000 Received: (at 70892) by debbugs.gnu.org; 19 May 2024 14:16:48 +0000 Received: from localhost ([127.0.0.1]:36386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8hLE-0001Yd-Et for submit@debbugs.gnu.org; Sun, 19 May 2024 10:16:48 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:46372 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8hLA-0001YI-GU for 70892@debbugs.gnu.org; Sun, 19 May 2024 10:16:45 -0400 Received: from m.tailaa68d.ts.net (unknown [107.174.64.25]) by APP-05 (Coremail) with SMTP id zQCowAB3BBKICUpmEQ4mDA--.20077S4; Sun, 19 May 2024 22:16:29 +0800 (CST) From: Zheng Junjie Date: Sun, 19 May 2024 22:15:26 +0800 Message-ID: <96674dcb17578ee1c04ead05b7314f2923d1018d.1716127516.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAB3BBKICUpmEQ4mDA--.20077S4 X-Coremail-Antispam: 1UD129KBjvdXoWrKrykAw4kuw1rtw1fKr4DJwb_yoWfCrXE93 s7Jrs3tFWUGFy7Kws5ZFn7uFWkWwsY9Fy8ur43tr18Jr15Xw1kXr9rurZ09r4rCFWkJ34a y39rtry3Zrn7CjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUba8YjsxI4VWDJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4 xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCa FVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFV Cjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWl x4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r 1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_ JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcS sGvfC2KfnxnUUI43ZEXa7IU83DG5UUUUU== X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -4.86 X-Migadu-Queue-Id: 0563F266EF X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -4.86 X-TUID: OirnzhQLNxht * 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