ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

maint: Do not xz-compress ISO images.

Browse source 
The xz-compressed image is 23% smaller than the original ISO image (with
built-in zlib compression), but the extra decompression step is
unconventional and often a hindrance for users.  See discussion at
<https://lists.gnu.org/archive/html/guix-devel/2021-04/msg00497.html>.

* Makefile.am (release): Do not compress ISO images.
* doc/guix.texi (USB Stick and DVD Installation): Remove ".xz" suffix
from URL and file name.
(Copying to a USB Stick, Burning on a DVD): Remove introductory words,
@enumerate, and first item.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Ludovic Courtès 2021-05-02 23:16:48 +02:00 committed by Maxim Cournoyer
parent 66072a00d7
commit 82c0f34c7e
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 6 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.am
View file

@ -886,9 +886,9 @@ release: dist-with-updated-version all
echo "failed to produced Guix installation image for $$system" >&2 ; \ echo "failed to produced Guix installation image for $$system" >&2 ; \
exit 1 ; \ exit 1 ; \
fi ; \ fi ; \
xz < "$$image" > "$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso.xz.tmp" ; \ cp "$$image" "$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso.tmp" ; \
mv "$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso.xz.tmp" \ mv "$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso.tmp" \
"$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso.xz" ; \ "$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso" ; \
done done
# Generate the VM images. # Generate the VM images.
for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \

30
doc/guix.texi
View file

@ -2099,7 +2099,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{@value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz}, @indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso},
where you can replace @code{x86_64-linux} with one of: where you can replace @code{x86_64-linux} with one of:
@table @code @table @code
@ -2115,8 +2115,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 @value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig $ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.sig
$ gpg --verify guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig $ gpg --verify guix-system-install-@value{VERSION}.x86_64-linux.iso.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,
@ -2140,17 +2140,6 @@ It is meant to be copied @emph{as is} to a large-enough USB stick or DVD.
@unnumberedsubsec Copying to a USB Stick @unnumberedsubsec Copying to a USB Stick
To copy the image to a USB stick, follow these steps:
@enumerate
@item
Decompress the image using the @command{xz} command:
@example
xz -d guix-system-install-@value{VERSION}.x86_64-linux.iso.xz
@end example
@item
Insert a USB stick of 1@tie{}GiB or more into your machine, and determine Insert a USB stick of 1@tie{}GiB or more into your machine, and determine
its device name. Assuming that the USB stick is known as @file{/dev/sdX}, its device name. Assuming that the USB stick is known as @file{/dev/sdX},
copy the image with: copy the image with:
@ -2161,21 +2150,9 @@ sync
@end example @end example
Access to @file{/dev/sdX} usually requires root privileges. Access to @file{/dev/sdX} usually requires root privileges.
@end enumerate
@unnumberedsubsec Burning on a DVD @unnumberedsubsec Burning on a DVD
To copy the image to a DVD, follow these steps:
@enumerate
@item
Decompress the image using the @command{xz} command:
@example
xz -d guix-system-install-@value{VERSION}.x86_64-linux.iso.xz
@end example
@item
Insert a blank DVD into your machine, and determine Insert a blank DVD into your machine, and determine
its device name. Assuming that the DVD drive is known as @file{/dev/srX}, its device name. Assuming that the DVD drive is known as @file{/dev/srX},
copy the image with: copy the image with:
@ -2185,7 +2162,6 @@ growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.x86_64-lin
@end example @end example
Access to @file{/dev/srX} usually requires root privileges. Access to @file{/dev/srX} usually requires root privileges.
@end enumerate
@unnumberedsubsec Booting @unnumberedsubsec Booting