02/05: maint: Add the '.iso' extension to installation images.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 3b6e7c703cff14020cfcdaa316875b28282c3477
Author: Ludovic Courtès <address@hidden>
Date:   Mon Dec 4 15:17:23 2017 +0100

    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.
---
 Makefile.am   |  6 +++---
 doc/guix.texi | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 24a803a..35d72f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -655,9 +655,9 @@ release: dist
            echo "failed to produced GuixSD installation image for $$system" 
>&2 ;      \
            exit 1 ;                                                            
        \
          fi ;                                                                  
        \
-         xz < "$$image" > "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz.tmp" 
;       \
-         mv "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz.tmp"               
        \
-            "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz" ;                 
        \
+         xz < "$$image" > 
"$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz.tmp" ;   \
+         mv "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz.tmp"           
        \
+            "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz" ;             
        \
        done
        for system in $(GUIXSD_VM_SYSTEMS) ; do                                 
        \
          image=`$(top_builddir)/pre-inst-env                                   
        \
diff --git a/doc/guix.texi b/doc/guix.texi
index 182dcd8..c39e495 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -7855,7 +7855,7 @@ about their support in GNU/Linux.
 
 An ISO-9660 installation image that can be written to a USB stick or
 burnt to a DVD can be downloaded from
address@hidden://alpha.gnu.org/gnu/guix/address@hidden@var{system}.xz},
address@hidden://alpha.gnu.org/gnu/guix/address@hidden@var{system}.iso.xz},
 where @var{system} is one of:
 
 @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:
 
 @example
-$ wget ftp://alpha.gnu.org/gnu/guix/address@hidden@var{system}.xz.sig
-$ gpg --verify address@hidden@var{system}.xz.sig
+$ wget ftp://alpha.gnu.org/gnu/guix/address@hidden@var{system}.iso.xz.sig
+$ gpg --verify address@hidden@var{system}.iso.xz.sig
 @end example
 
 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:
 
 @example
-xz -d address@hidden@var{system}.xz
+xz -d address@hidden@var{system}.iso.xz
 @end example
 
 @item
@@ -7907,7 +7907,7 @@ its device name.  Assuming that the USB stick is known as 
@file{/dev/sdX},
 copy the image with:
 
 @example
-dd address@hidden of=/dev/sdX
+dd address@hidden of=/dev/sdX
 sync
 @end example
 
@@ -7923,7 +7923,7 @@ To copy the image to a DVD, follow these steps:
 Decompress the image using the @command{xz} command:
 
 @example
-xz -d address@hidden@var{system}.xz
+xz -d address@hidden@var{system}.iso.xz
 @end example
 
 @item
@@ -7932,7 +7932,7 @@ its device name.  Assuming that the DVD drive is known as 
@file{/dev/srX},
 copy the image with:
 
 @example
-growisofs -dvd-compat -Z /dev/address@hidden
+growisofs -dvd-compat -Z /dev/address@hidden
 @end example
 
 Access to @file{/dev/srX} usually requires root privileges.
@@ -8317,7 +8317,7 @@ Boot the USB installation image in an VM:
 @example
 qemu-system-x86_64 -m 1024 -smp 1 \
   -net user -net nic,model=virtio -boot menu=on \
-  -drive address@hidden@var{system} \
+  -drive address@hidden@var{system}.iso \
   -drive file=guixsd.img
 @end example