From patchwork Mon Jan 15 21:57:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58919 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5E3CA27BBEC; Mon, 15 Jan 2024 21:58:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BA54127BBEB for ; Mon, 15 Jan 2024 21:58:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPUy6-0000Sc-Bs; Mon, 15 Jan 2024 16:58:06 -0500 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 1rPUy4-0000ST-Fs for guix-patches@gnu.org; Mon, 15 Jan 2024 16:58:04 -0500 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 1rPUy4-0008Vl-7m for guix-patches@gnu.org; Mon, 15 Jan 2024 16:58:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPUy3-0003ls-Qr for guix-patches@gnu.org; Mon, 15 Jan 2024 16:58:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68488] [PATCH] image: Consider grub-efi-removable-bootloader to be EFI bootloader. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Jan 2024 21:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68488@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170535587614422 (code B ref -1); Mon, 15 Jan 2024 21:58:03 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jan 2024 21:57:56 +0000 Received: from localhost ([127.0.0.1]:47162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPUxv-0003kX-Jv for submit@debbugs.gnu.org; Mon, 15 Jan 2024 16:57:55 -0500 Received: from lists.gnu.org ([2001:470:142::17]:50360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rPUxt-0003kL-Pg for submit@debbugs.gnu.org; Mon, 15 Jan 2024 16:57:54 -0500 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 <~@wolfsden.cz>) id 1rPUxn-0000S0-RV for guix-patches@gnu.org; Mon, 15 Jan 2024 16:57:47 -0500 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1rPUxl-0008U0-Md for guix-patches@gnu.org; Mon, 15 Jan 2024 16:57:47 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id B47942527FF; Mon, 15 Jan 2024 21:57:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1705355861; bh=J10XwWesXFMgULMUWU5XyRBHZ1X2BvOQmAsu6w1DnfQ=; h=From:To:Cc:Subject:Date; b=FO6g5yZmjZfJ2l4auat8HksZDhJfJdavhz5Od57HEYiubIogUVnG+YDYBFo3qIHXK v8kwC5cWafqCvcOYDZWDNxSiA+r6vf9gq3D7/WYNxW5xP4Aapk1MZzrRrar58jUY/d ov1XvUBIOlTTDVOn+JaXGpvEuXSeqJBSjt7Os+pfPCrwFsz5uNKgu0yAlMU+aSeVOf 1gZWxCT+zGSzOqA9I7EMv5WDtO0fK1hXFFFnXSRUjfeYTbO7zO97aY/r8uTghtwg7D I3pwZFlLrKvzz6y96abWxAbJG7jd0MnV5UGQSoVKCaPAD7MuZhTjHrb0+nkQgUGmo1 Fj4VIowIYRNs3sNoQfp4hcPDvYSZPv5Mz3MTO0HLrUYtXFKZnLbgfDGxDh2F6yi/zC Nn0g/KBL6KEWLtd+dfnE6qqGx5EIuACk8uzAAXMwiEh+NNp+GP+60ku1zGvLzeSQrq lECgAyeJjzLmhMMXyh6/cPENRNZh0V1g2nHi50p3bV5q+iFHtKaYIlkz3QDM8kaIRg 3AcFgjsBscBQKZ+APkK9ddMW0wCKJoapIUsrSeuqOWEOI2tvjG5FaMtLfB+SA4YL0O 9kLN52c5VfTMj/xqvlIIubZ3CIUE1fbtTdfoeT7tdAYropTJB9FrNJaud25fFgDszX R7LY62ihPBSbRwyUeignxhyA= Received: from localhost (unknown [193.32.127.174]) by wolfsden.cz (Postfix) with ESMTPSA id 58C5325199C; Mon, 15 Jan 2024 21:57:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1705355861; bh=J10XwWesXFMgULMUWU5XyRBHZ1X2BvOQmAsu6w1DnfQ=; h=From:To:Cc:Subject:Date; b=FO6g5yZmjZfJ2l4auat8HksZDhJfJdavhz5Od57HEYiubIogUVnG+YDYBFo3qIHXK v8kwC5cWafqCvcOYDZWDNxSiA+r6vf9gq3D7/WYNxW5xP4Aapk1MZzrRrar58jUY/d ov1XvUBIOlTTDVOn+JaXGpvEuXSeqJBSjt7Os+pfPCrwFsz5uNKgu0yAlMU+aSeVOf 1gZWxCT+zGSzOqA9I7EMv5WDtO0fK1hXFFFnXSRUjfeYTbO7zO97aY/r8uTghtwg7D I3pwZFlLrKvzz6y96abWxAbJG7jd0MnV5UGQSoVKCaPAD7MuZhTjHrb0+nkQgUGmo1 Fj4VIowIYRNs3sNoQfp4hcPDvYSZPv5Mz3MTO0HLrUYtXFKZnLbgfDGxDh2F6yi/zC Nn0g/KBL6KEWLtd+dfnE6qqGx5EIuACk8uzAAXMwiEh+NNp+GP+60ku1zGvLzeSQrq lECgAyeJjzLmhMMXyh6/cPENRNZh0V1g2nHi50p3bV5q+iFHtKaYIlkz3QDM8kaIRg 3AcFgjsBscBQKZ+APkK9ddMW0wCKJoapIUsrSeuqOWEOI2tvjG5FaMtLfB+SA4YL0O 9kLN52c5VfTMj/xqvlIIubZ3CIUE1fbtTdfoeT7tdAYropTJB9FrNJaud25fFgDszX R7LY62ihPBSbRwyUeignxhyA= From: Tomas Volf <~@wolfsden.cz> Date: Mon, 15 Jan 2024 22:57:35 +0100 Message-ID: <8591c1022344b09e865048d2c20fbb8ee3375654.1705355855.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Without this change, trying to create a system image with efi-raw type while using grub-efi-removable-bootloader fails with fairly confusing message: EFI bootloader required with GPT partitioning * gnu/system/image.scm (system-disk-image): Consider grub-efi-removable-bootloader to be EFI bootloader. Change-Id: I5f5e1a94e825fd29d6880c5bafb330e16a5ac962 --- gnu/system/image.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) base-commit: 31e736dac29e6f0ff8a2de3f28e210a68684ad21 diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 2cc1012893..5456b3a5a0 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -535,7 +535,8 @@ (define* (system-disk-image image (when (and (gpt-image? image) (not - (memq (bootloader-name bootloader) '(grub-efi grub-efi32)))) + (memq (bootloader-name bootloader) + '(grub-efi grub-efi32 grub-efi-removable-bootloader)))) (raise (formatted-message (G_ "EFI bootloader required with GPT partitioning"))))