image: Rename "raw" image-type to "efi-raw".

* 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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Mathieu Othacehe 2020-12-03 11:53:53 +01:00
parent 014845591a
commit 2f497d94e7
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
3 changed files with 9 additions and 9 deletions

View File

@ -31406,7 +31406,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
@ -31425,8 +31425,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:
@ -31553,8 +31553,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

View File

@ -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
@ -157,9 +157,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

View File

@ -1143,7 +1143,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)