From patchwork Sat Sep 9 15:57:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 53693 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 E926927BBEA; Sat, 9 Sep 2023 16:58:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 AAD7027BBE2 for ; Sat, 9 Sep 2023 16:58:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qf0LT-0006E7-BX; Sat, 09 Sep 2023 11:58:03 -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 1qf0LQ-0006Df-M3 for guix-patches@gnu.org; Sat, 09 Sep 2023 11:58: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 1qf0LP-0003XD-Fv for guix-patches@gnu.org; Sat, 09 Sep 2023 11:58:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qf0LS-0000MR-CR for guix-patches@gnu.org; Sat, 09 Sep 2023 11:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65842] [PATCH 1/2] image: Introduce the mbr-hybrid-raw image type. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Sep 2023 15:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65842@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 65842-submit@debbugs.gnu.org id=B65842.16942750611337 (code B ref 65842); Sat, 09 Sep 2023 15:58:02 +0000 Received: (at 65842) by debbugs.gnu.org; 9 Sep 2023 15:57:41 +0000 Received: from localhost ([127.0.0.1]:48341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qf0L6-0000LS-Sb for submit@debbugs.gnu.org; Sat, 09 Sep 2023 11:57:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qf0L4-0000L4-Nz for 65842@debbugs.gnu.org; Sat, 09 Sep 2023 11:57:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qf0Kw-0003Ua-FL for 65842@debbugs.gnu.org; Sat, 09 Sep 2023 11:57:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=KmgfOa5oepfxGlu9rtgF2JhfVBIrvjYLpEc7enpxzEI=; b=WTgsb1UcfMnbowRMafQ2 S4abvM8Pj+YnDX1dh7lO4zFnJ+JoQvR1+EfKpvm0OgCDxy4M/jykfKJFy51X5RC9syh65h+jacoin XJlI3CrMKpm+sQgRiP6d9KGQKOuahm5k9GN0xVE0tgtKkXpWGOGmlWrBydJdNF+jgqJjdtjPQDRsZ 3TZ5Fk456TpU1JvAbzmgyDhPoc+pa1DnjzaJu11ePBLsywRDDWeuptcVoIt/MrbLNhF5ssqNutZRi PQca3B2nKRJfBt8M0gv1xpyyxo/S/457QgQd9QGGm0pSALNO3/jPRpHgNaguboEw/Sk+EQHJJ5Mpe +RUEkF3FWCnSCQ==; From: Mathieu Othacehe Date: Sat, 9 Sep 2023 17:57:25 +0200 Message-Id: <65eda8765c093f29802e71f3972810b12e845c81.1694273927.git.othacehe@gnu.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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 Until 209204e23b39af09e0ea92540b6fa00a60e6a0ae and d57cab764122af69d52d8cc9c843456044e5d7bc, the default image type used by "guix system image" was an MBR image with an ESP partition. Having both an MBR image and an ESP partition is handy because the image will boot on most x86 based systems using legacy BIOS and/or UEFI. We now have a distinction between MBR images and EFI images. Introduce a new MBR hybrid image type and default to it to restore the default behaviour. This also fixes the images section of (gnu ci) that was trying to install a BIOS bootloader on an EFI, GPT image and failing to do so. --- doc/guix.texi | 34 +++++++++++++++++++++++++++------- gnu/ci.scm | 2 +- gnu/system/image.scm | 14 ++++++++++++++ guix/scripts/system.scm | 2 +- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 339dcb2a41..22135254ea 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -40912,8 +40912,8 @@ Invoking guix system @cindex image, creating disk images The @code{image} command can produce various image types. The image type can be selected using the @option{--image-type} option. It -defaults to @code{mbr-raw}. When its value is @code{iso9660}, the -@option{--label} option can be used to specify a volume ID with +defaults to @code{mbr-hybrid-raw}. When its value is @code{iso9660}, +the @option{--label} option can be used to specify a volume ID with @code{image}. By default, the root file system of a disk image is mounted non-volatile; the @option{--volatile} option can be provided to make it volatile instead. When using @code{image}, the bootloader @@ -40931,8 +40931,8 @@ Invoking guix system -bios $(guix build ovmf)/share/firmware/ovmf_x64.bin @end example -When using the @code{mbr-raw} image type, a raw disk image is produced; -it can be copied as is to a USB stick, for instance. Assuming +When using the @code{mbr-hybrid-raw} image type, a raw disk image is +produced; it can be copied as is to a USB stick, for instance. Assuming @code{/dev/sdc} is the device corresponding to a USB stick, one can copy the image to it using the following command: @@ -41069,7 +41069,7 @@ Invoking guix system For the @code{image} action, create an image with given @var{type}. When this option is omitted, @command{guix system} uses the -@code{mbr-raw} image type. +@code{mbr-hybrid-raw} image type. @cindex ISO-9660 format @cindex CD image format @@ -45277,7 +45277,7 @@ System Images The @command{guix system image} command is able to turn an operating system definition into a bootable image. This command supports -different image types, such as @code{mbr-raw}, @code{iso9660} and +different image types, such as @code{mbr-hybrid-raw}, @code{iso9660} and @code{docker}. Any modern @code{x86_64} machine will probably be able to boot from an @code{iso9660} image. However, there are a few machines out there that require specific image types. Those machines, in general @@ -45541,8 +45541,24 @@ Instantiate an Image system image)} module provides the following @code{image} definition variables. +@defvar mbr-disk-image +An MBR disk-image composed of a single ROOT partition. The ROOT +partition starts at a 1@tie{}MiB offset so that the bootloader can +install itself in the post-MBR gap. +@end defvar + +@defvar mbr-hybrid-disk-image +An MBR disk-image composed of two partitions: a 64 bits ESP partition +and a ROOT boot partition. The ESP partition starts at a 1@tie{}MiB +offset so that a BIOS compatible bootloader can install itself in the +post-MBR gap. The image can be used by @code{x86_64} and @code{i686} +machines supporting only legacy BIOS booting. The ESP partition ensures +that it can also be used by newer machines relying on UEFI booting, +hence the @emph{hybrid} denomination. +@end defvar + @defvar efi-disk-image -A MBR disk-image composed of two partitions: a 64 bits ESP partition and +A GPT disk-image composed of two partitions: a 64 bits ESP partition and a ROOT boot partition. This image can be used on most @code{x86_64} and @code{i686} machines, supporting BIOS or UEFI booting. @end defvar @@ -45633,6 +45649,10 @@ image-type Reference Build an image based on the @code{mbr-disk-image} image. @end defvar +@defvar mbr-hybrid-raw-image-type +Build an image based on the @code{mbr-hybrid-disk-image} image. +@end defvar + @defvar efi-raw-image-type Build an image based on the @code{efi-disk-image} image. @end defvar diff --git a/gnu/ci.scm b/gnu/ci.scm index 520ac28110..279dd4d910 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -268,7 +268,7 @@ (define* (image-jobs store system (if (member system %guix-system-supported-systems) `(,(image->job store (image - (inherit efi-disk-image) + (inherit mbr-hybrid-disk-image) (operating-system installation-os)) #:name "usb-image" #:system system) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 5b8da2f896..b1b928b222 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -77,6 +77,7 @@ (define-module (gnu system image) root-partition mbr-disk-image + mbr-hybrid-disk-image efi-disk-image iso9660-image docker-image @@ -86,6 +87,7 @@ (define-module (gnu system image) image-with-os mbr-raw-image-type + mbr-hybrid-raw-image-type efi-raw-image-type efi32-raw-image-type qcow2-image-type @@ -156,6 +158,13 @@ (define mbr-disk-image (inherit root-partition) (offset root-offset)))))) +(define mbr-hybrid-disk-image + (image-without-os + (format 'disk-image) + (partition-table-type 'mbr) + (partitions + (list esp-partition root-partition)))) + (define efi-disk-image (image-without-os (format 'disk-image) @@ -217,6 +226,11 @@ (define mbr-raw-image-type (name 'mbr-raw) (constructor (cut image-with-os mbr-disk-image <>)))) +(define mbr-hybrid-raw-image-type + (image-type + (name 'mbr-hybrid-raw) + (constructor (cut image-with-os mbr-hybrid-disk-image <>)))) + (define efi-raw-image-type (image-type (name 'efi-raw) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index ec331809ef..547387d5e1 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -1169,7 +1169,7 @@ (define %default-options (debug . 0) (verbosity . #f) ;default (validate-reconfigure . ,ensure-forward-reconfigure) - (image-type . mbr-raw) + (image-type . mbr-hybrid-raw) (image-size . guess) (install-bootloader? . #t) (label . #f) From patchwork Sat Sep 9 15:57:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 53692 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 DB2AA27BBEA; Sat, 9 Sep 2023 16:58:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 6646827BBE2 for ; Sat, 9 Sep 2023 16:58:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qf0LT-0006EB-Ig; Sat, 09 Sep 2023 11:58:03 -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 1qf0LQ-0006De-Ll for guix-patches@gnu.org; Sat, 09 Sep 2023 11:58: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 1qf0LP-0003X6-K0 for guix-patches@gnu.org; Sat, 09 Sep 2023 11:58:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qf0LR-0000MD-Se for guix-patches@gnu.org; Sat, 09 Sep 2023 11:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65842] [PATCH 2/2] image: Do not allow BIOS bootloader and GPT. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Sep 2023 15:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65842@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 65842-submit@debbugs.gnu.org id=B65842.16942750601331 (code B ref 65842); Sat, 09 Sep 2023 15:58:01 +0000 Received: (at 65842) by debbugs.gnu.org; 9 Sep 2023 15:57:40 +0000 Received: from localhost ([127.0.0.1]:48339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qf0L6-0000LN-HI for submit@debbugs.gnu.org; Sat, 09 Sep 2023 11:57:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qf0L5-0000L6-0Q for 65842@debbugs.gnu.org; Sat, 09 Sep 2023 11:57:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qf0Kw-0003Ug-Pb for 65842@debbugs.gnu.org; Sat, 09 Sep 2023 11:57:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=d/JkcrQOxVr6Rzja5ilKAwzIawmYhaHC+Dk7MX/RbqA=; b=D5GU1hvFeAQNEfkNLYmF fXAk8IbYHbk2/fbNpDSAPlckcL8yVIynBi6jhgv3PJuW07TGAVhfpnzwF0e0E67eSFBFLChdzB76C COXjVh46UuBCeSOruPYwFjcZ8JmsSBSACsHHsRLnvXY51Bg9mnyLA0DqKORUH3baqKXwkPYH2Vgvg 5+KQ7fmINWm3itMvtaoK+TyiDPqE0tG81CGBpxLPQBTkYZ4jXnOjym3WIBeuStHu/l0QhBmLLEb2I P1sx6f5w/L/7ZktUXdT0mAmABXVx6Ep5SAGHaXwFixGY8vmAfcy9f65Oi4XhYnODHOjbJ+uWw0oDb B2wqvWF4XEd96Q==; From: Mathieu Othacehe Date: Sat, 9 Sep 2023 17:57:26 +0200 Message-Id: <627b212f6b5bf9fd412e8c899b67b031cb1c4a00.1694273927.git.othacehe@gnu.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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 When using grub-bootloader with a GPT image, GRUB will fail during installation with a cryptic error message. * gnu/system/image.scm (system-disk-image): Raise an error when trying to use a non-EFI compatible bootloader with a GPT image partitioning. --- gnu/system/image.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index b1b928b222..fa4cab0b03 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -530,6 +530,13 @@ (define* (system-disk-image image (image-partition-table-type image))) (else ""))) + (when (and (gpt-image? image) + (not + (memq (bootloader-name bootloader) '(grub-efi grub-efi32)))) + (raise + (formatted-message + (G_ "EFI bootloader required with GPT partitioning")))) + (let* ((format (image-format image)) (image-type (format->image-type format)) (image-type-options (genimage-type-options image-type image))