maint: Add the '.iso' extension to installation images.

* Makefile.am (release): Add the '.iso' suffix to image files.
* doc/guix.texi (USB Stick and DVD Installation): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2017-12-04 15:17:23 +01:00
parent 2626062b25
commit 3b6e7c703c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 11 additions and 11 deletions

View File

@ -655,9 +655,9 @@ release: dist
echo "failed to produced GuixSD installation image for $$system" >&2 ; \ echo "failed to produced GuixSD installation image for $$system" >&2 ; \
exit 1 ; \ exit 1 ; \
fi ; \ fi ; \
xz < "$$image" > "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz.tmp" ; \ xz < "$$image" > "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz.tmp" ; \
mv "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz.tmp" \ mv "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz.tmp" \
"$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz" ; \ "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz" ; \
done done
for system in $(GUIXSD_VM_SYSTEMS) ; do \ for system in $(GUIXSD_VM_SYSTEMS) ; do \
image=`$(top_builddir)/pre-inst-env \ image=`$(top_builddir)/pre-inst-env \

View File

@ -7855,7 +7855,7 @@ about their support in GNU/Linux.
An ISO-9660 installation image that can be written to a USB stick or An ISO-9660 installation image that can be written to a USB stick or
burnt to a DVD can be downloaded from burnt to a DVD can be downloaded from
@indicateurl{ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.xz}, @indicateurl{ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz},
where @var{system} is one of: where @var{system} is one of:
@table @code @table @code
@ -7871,8 +7871,8 @@ Make sure to download the associated @file{.sig} file and to verify the
authenticity of the image against it, along these lines: authenticity of the image against it, along these lines:
@example @example
$ wget ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.xz.sig $ wget ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig
$ gpg --verify guixsd-install-@value{VERSION}.@var{system}.xz.sig $ gpg --verify guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig
@end example @end example
If that command fails because you do not have the required public key, If that command fails because you do not have the required public key,
@ -7898,7 +7898,7 @@ To copy the image to a USB stick, follow these steps:
Decompress the image using the @command{xz} command: Decompress the image using the @command{xz} command:
@example @example
xz -d guixsd-install-@value{VERSION}.@var{system}.xz xz -d guixsd-install-@value{VERSION}.@var{system}.iso.xz
@end example @end example
@item @item
@ -7907,7 +7907,7 @@ its device name. Assuming that the USB stick is known as @file{/dev/sdX},
copy the image with: copy the image with:
@example @example
dd if=guixsd-install-@value{VERSION}.x86_64-linux of=/dev/sdX dd if=guixsd-install-@value{VERSION}.x86_64-linux.iso of=/dev/sdX
sync sync
@end example @end example
@ -7923,7 +7923,7 @@ To copy the image to a DVD, follow these steps:
Decompress the image using the @command{xz} command: Decompress the image using the @command{xz} command:
@example @example
xz -d guixsd-install-@value{VERSION}.@var{system}.xz xz -d guixsd-install-@value{VERSION}.@var{system}.iso.xz
@end example @end example
@item @item
@ -7932,7 +7932,7 @@ its device name. Assuming that the DVD drive is known as @file{/dev/srX},
copy the image with: copy the image with:
@example @example
growisofs -dvd-compat -Z /dev/srX=guixsd-install-@value{VERSION}.x86_64 growisofs -dvd-compat -Z /dev/srX=guixsd-install-@value{VERSION}.x86_64.iso
@end example @end example
Access to @file{/dev/srX} usually requires root privileges. Access to @file{/dev/srX} usually requires root privileges.
@ -8317,7 +8317,7 @@ Boot the USB installation image in an VM:
@example @example
qemu-system-x86_64 -m 1024 -smp 1 \ qemu-system-x86_64 -m 1024 -smp 1 \
-net user -net nic,model=virtio -boot menu=on \ -net user -net nic,model=virtio -boot menu=on \
-drive file=guixsd-install-@value{VERSION}.@var{system} \ -drive file=guixsd-install-@value{VERSION}.@var{system}.iso \
-drive file=guixsd.img -drive file=guixsd.img
@end example @end example