*** guix.texi	2016-05-31 16:07:52.443176978 -0400
--- guix-mod.texi	2016-05-31 16:36:07.895090213 -0400
***************
*** 5955,5961 ****
  
  Once this is done, you should be able to reboot the system and boot from
  the USB stick.  The latter usually requires you to get in the BIOS' boot
! menu, where you can choose to boot from the USB stick.
  
  @node Preparing for Installation
  @subsection Preparing for Installation
--- 5955,5962 ----
  
  Once this is done, you should be able to reboot the system and boot from
  the USB stick.  The latter usually requires you to get in the BIOS' boot
! menu, where you can choose to boot from the USB stick.  You may have to
! disable UEFI boot.
  
  @node Preparing for Installation
  @subsection Preparing for Installation
***************
*** 6069,6078 ****
  The installation image includes several partitioning tools, including
  Parted (@pxref{Overview,,, parted, GNU Parted User Manual}),
  @command{fdisk}, and @command{cfdisk}.  Run it and set up your disk with
! the partition layout you want:
  
  @example
! cfdisk
  @end example
  
  Once you are done partitioning the target hard disk drive, you have to
--- 6070,6090 ----
  The installation image includes several partitioning tools, including
  Parted (@pxref{Overview,,, parted, GNU Parted User Manual}),
  @command{fdisk}, and @command{cfdisk}.  Run it and set up your disk with
! the partition layout you want.  The following example assumes your
! motherboard supports GPT partition tables, and will render all data
! currently on your drive inaccessible.  Make sure you @code{select}
! the device you want to install GuixSD on.
  
  @example
! # parted
! (parted) print all
! (parted) select /dev/sda
! (parted) mklabel gpt
! (parted) mkpart primary 1MiB 2MiB
! (parted) toggle 1 bios_grub
! (parted) mkpart primary 2MiB 100%
! (parted) print
! (parted) quit
  @end example
  
  Once you are done partitioning the target hard disk drive, you have to
***************
*** 6089,6095 ****
  @code{my-root} can be created with:
  
  @example
! mkfs.ext4 -L my-root /dev/sda1
  @end example
  
  @c FIXME: Uncomment this once GRUB fully supports encrypted roots.
--- 6101,6107 ----
  @code{my-root} can be created with:
  
  @example
! mkfs.ext4 -L my-root /dev/sda2
  @end example
  
  @c FIXME: Uncomment this once GRUB fully supports encrypted roots.
***************
*** 6098,6104 ****
  @c @example
  @c # fdisk /dev/sdX
  @c @dots{} Create partitions etc.@dots{}
! @c # cryptsetup luksFormat /dev/sdX1
  @c # cryptsetup open --type luks /dev/sdX1 my-partition
  @c # mkfs.ext4 -L my-root /dev/mapper/my-partition
  @c @end example
--- 6110,6116 ----
  @c @example
  @c # fdisk /dev/sdX
  @c @dots{} Create partitions etc.@dots{}
! @c # cryptsetup luksFormat /dev/sdX2
  @c # cryptsetup open --type luks /dev/sdX1 my-partition
  @c # mkfs.ext4 -L my-root /dev/mapper/my-partition
  @c @end example
***************
*** 6108,6127 ****
  Cryptsetup/LUKS for disk encryption.
  
  Once that is done, mount the target root partition under @file{/mnt}
! with a command like (again, assuming @file{/dev/sda1} is the root
  partition):
  
  @example
! mount /dev/sda1 /mnt
  @end example
  
  Finally, if you plan to use one or more swap partitions (@pxref{Memory
  Concepts, swap space,, libc, The GNU C Library Reference Manual}), make
  sure to initialize them with @command{mkswap}.  Assuming you have one
! swap partition on @file{/dev/sda2}, you would run:
  
  @example
! mkswap /dev/sda2
  @end example
  
  @node Proceeding with the Installation
--- 6120,6139 ----
  Cryptsetup/LUKS for disk encryption.
  
  Once that is done, mount the target root partition under @file{/mnt}
! with a command like (again, assuming @file{/dev/sda2} is the root
  partition):
  
  @example
! mount /dev/sda2 /mnt
  @end example
  
  Finally, if you plan to use one or more swap partitions (@pxref{Memory
  Concepts, swap space,, libc, The GNU C Library Reference Manual}), make
  sure to initialize them with @command{mkswap}.  Assuming you have one
! swap partition on @file{/dev/sda3}, you would run:
  
  @example
! mkswap /dev/sda3
  @end example
  
  @node Proceeding with the Installation