From patchwork Thu Dec 3 10:53:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 25553 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 4963527BBFC; Thu, 3 Dec 2020 10:56:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CFA1227BBFB for ; Thu, 3 Dec 2020 10:56:53 +0000 (GMT) Received: from localhost ([::1]:58118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkmI8-0007Ng-Un for patchwork@mira.cbaines.net; Thu, 03 Dec 2020 05:56:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkmGO-0004H3-AA for guix-patches@gnu.org; Thu, 03 Dec 2020 05:55:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55268) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kkmGN-0002Bn-WA for guix-patches@gnu.org; Thu, 03 Dec 2020 05:55:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kkmGO-0003Ij-00 for guix-patches@gnu.org; Thu, 03 Dec 2020 05:55:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45022] [PATCH 2/2] image: Rename "raw" image-type to "efi-raw". Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Dec 2020 10:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45022 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45022@debbugs.gnu.org Cc: dannym@scratchpost.org, Mathieu Othacehe X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160699286212602 (code B ref -1); Thu, 03 Dec 2020 10:55:03 +0000 Received: (at submit) by debbugs.gnu.org; 3 Dec 2020 10:54:22 +0000 Received: from localhost ([127.0.0.1]:38577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkmFh-0003H7-HQ for submit@debbugs.gnu.org; Thu, 03 Dec 2020 05:54:21 -0500 Received: from lists.gnu.org ([209.51.188.17]:43676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkmFg-0003Gu-Ai for submit@debbugs.gnu.org; Thu, 03 Dec 2020 05:54:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkmFg-0003hQ-2k for guix-patches@gnu.org; Thu, 03 Dec 2020 05:54:20 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41177) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkmFf-0001rL-SK; Thu, 03 Dec 2020 05:54:19 -0500 Received: from [2a01:e0a:19b:d9a0:6132:5f9a:6e69:6e32] (port=54264 helo=localhost.localdomain) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kkmFb-0006vx-Uf; Thu, 03 Dec 2020 05:54:18 -0500 From: Mathieu Othacehe Date: Thu, 3 Dec 2020 11:53:53 +0100 Message-Id: <20201203105353.149482-3-othacehe@gnu.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201203105353.149482-1-othacehe@gnu.org> References: <20201203105353.149482-1-othacehe@gnu.org> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/system/image.scm (raw-image-type): Rename to "efi-raw-image-type". * guix/scripts/system.scm (%default-options): Adapt accordingly. * doc/guix.texi: Ditto. --- doc/guix.texi | 10 +++++----- gnu/system/image.scm | 6 +++--- guix/scripts/system.scm | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 889f380108..c44f330fec 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31156,7 +31156,7 @@ the @option{--image-size} option is ignored in the case of @cindex disk-image, creating disk images The @code{disk-image} command can produce various image types. The image type can be selected using the @option{--image-type} option. It -defaults to @code{raw}. When its value is @code{iso9660}, the +defaults to @code{efi-raw}. When its value is @code{iso9660}, the @option{--label} option can be used to specify a volume ID with @code{disk-image}. By default, the root file system of a disk image is mounted non-volatile; the @option{--volatile} option can be provided to @@ -31175,8 +31175,8 @@ qemu-system-x86_64 -enable-kvm -hda /tmp/my-image.qcow2 -m 1000 \ -bios $(guix build ovmf)/share/firmware/ovmf_x64.bin @end example -When using the @code{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{efi-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: @@ -31303,8 +31303,8 @@ of the image. @itemx -t @var{type} For the @code{disk-image} action, create an image with given @var{type}. -When this option is omitted, @command{guix system} uses the @code{raw} -image type. +When this option is omitted, @command{guix system} uses the +@code{efi-raw} image type. @cindex ISO-9660 format @cindex CD image format diff --git a/gnu/system/image.scm b/gnu/system/image.scm index f3d5734381..5505540100 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -70,7 +70,7 @@ arm64-disk-image image-with-os - raw-image-type + efi-raw-image-type qcow2-image-type iso-image-type uncompressed-iso-image-type @@ -159,9 +159,9 @@ set to the given OS." (inherit base-image) (operating-system os))) -(define raw-image-type +(define efi-raw-image-type (image-type - (name 'raw) + (name 'efi-raw) (constructor (cut image-with-os efi-disk-image <>)))) (define qcow2-image-type diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index db80e0be8f..f077947d75 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -1116,7 +1116,7 @@ Some ACTIONS support additional ARGS.\n")) (debug . 0) (verbosity . #f) ;default (validate-reconfigure . ,ensure-forward-reconfigure) - (image-type . raw) + (image-type . efi-raw) (image-size . guess) (install-bootloader? . #t) (label . #f)