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 ms8.migadu.com with LMTPS id eC2vI4+qpWVRuwAAqHPOHw:P1 (envelope-from ) for ; Mon, 15 Jan 2024 22:58:39 +0100 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 eC2vI4+qpWVRuwAAqHPOHw (envelope-from ) for ; Mon, 15 Jan 2024 22:58:39 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=FO6g5yZm; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=FO6g5yZm; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wolfsden.cz (policy=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705355919; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=IkvKP0FvPjCQ8nvmmFjhFGUr4E5MC6+khYfzky5grGY=; b=Hj92sL2JvHh50JxpZINy7c7m0RrxBqpRbdSPAj6dc42E+KxUcj6jpUEvcAv9e3NCvPX7oT oQjUMqF2hUq1JYsb4xYYhzRGyeZYvTICZXUjipOk99bA0SlIxVPa+V6FLVixsTD0BbzOQw R1tw4tteKGpj3OSyGsL7e4TZifTZN7trskFRLwRCTtpEIoh7DMmURT2zsE5zfNFMk1uE/O keE+9kQ4324mXdStFdWBa+nA0K7n7ErhCHAgRtsYACEhx9FWNfvOJO/uLyfWav0p9sAFOA nFrHtCzwcX8CmRaZMeLwjqWnlMhXuZlnlFNZNOfWI5JKyAt0olEU+XXmlMEVgQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1705355919; a=rsa-sha256; cv=none; b=mkyZjpWQHz8q3i0nh8YjLjf6evdjUVb8xBL3XhlVMMfwNG6raUUWoYoGWgWbfX7BIkntO2 AwsS7UJ3BlCOy8+r3yG8kNS1Z/8Xe+hq6nMi0uPKnT554yeYFxv6B6gp3FDaIPmcmEPgIx 9wsLqIKK/mb7yFvxHYe2LXmwM6OTJNGafRqohvK8h6Ym0LwE/S/kn92JJeFQ5cbO+5BnWY z7S97XXmzf7D4/daXtAzOHEOHJzwpohoxo4r6wErS/AqcKDE9Ls8Ssgs+PEmTf9X7bapOy QS6WdW2C1e19XOwfyh5AIwFIh8zdFGhhDVSD8qXH2bHGjSA3D94JdMRPWPB/2g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=FO6g5yZm; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=FO6g5yZm; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wolfsden.cz (policy=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" 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 34EE19EAA for ; Mon, 15 Jan 2024 22:58:39 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 3.81 X-Spam-Score: 3.81 X-Migadu-Queue-Id: 34EE19EAA X-TUID: QOru7ZQ9xisQ 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(-) 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")))) base-commit: 31e736dac29e6f0ff8a2de3f28e210a68684ad21 -- 2.41.0