aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-06-26 11:59:51 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-06-26 17:27:40 +0200
commit671dd8d6e6088055d31315315e3bdd1c4fa90a0f (patch)
treecd552246818a98f17596dd49aba490cf111af089
parenta1fa2691cdc57b3874480b3b3d7dba470d8a5e41 (diff)
downloadguix-671dd8d6e6088055d31315315e3bdd1c4fa90a0f.tar
guix-671dd8d6e6088055d31315315e3bdd1c4fa90a0f.tar.gz
doc: Use a consistent partitioning scheme.
* doc/guix.texi (Preparing for Installation): Consistently refer to the ESP as /dev/sda1; root file system as /dev/sda2; and swap as /dev/sda3.
-rw-r--r--doc/guix.texi20
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index da05a200a1..d3375601aa 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8641,21 +8641,21 @@ create a file system on the relevant partition(s)@footnote{Currently
GuixSD only supports ext4 and btrfs file systems. In particular, code
that reads file system UUIDs and labels only works for these file system
types.}. For the ESP, if you have one and assuming it is
-@file{/dev/sda2}, run:
+@file{/dev/sda1}, run:
@example
-mkfs.fat -F32 /dev/sda2
+mkfs.fat -F32 /dev/sda1
@end example
Preferably, assign file systems a label so that you can easily and
reliably refer to them in @code{file-system} declarations (@pxref{File
Systems}). This is typically done using the @code{-L} option of
@command{mkfs.ext4} and related commands. So, assuming the target root
-partition lives at @file{/dev/sda1}, a file system with the label
+partition lives at @file{/dev/sda2}, a file system with the label
@code{my-root} can be created with:
@example
-mkfs.ext4 -L my-root /dev/sda1
+mkfs.ext4 -L my-root /dev/sda2
@end example
@cindex encrypted disk
@@ -8663,12 +8663,12 @@ If you are instead planning to encrypt the root partition, you can use
the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html,
@uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}},
@code{man cryptsetup}} for more information.) Assuming you want to
-store the root partition on @file{/dev/sda1}, the command sequence would
+store the root partition on @file{/dev/sda2}, the command sequence would
be along these lines:
@example
-cryptsetup luksFormat /dev/sda1
-cryptsetup open --type luks /dev/sda1 my-partition
+cryptsetup luksFormat /dev/sda2
+cryptsetup open --type luks /dev/sda2 my-partition
mkfs.ext4 -L my-root /dev/mapper/my-partition
@end example
@@ -8688,11 +8688,11 @@ by @code{guix system init} afterwards.
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:
+swap partition on @file{/dev/sda3}, you would run:
@example
-mkswap /dev/sda2
-swapon /dev/sda2
+mkswap /dev/sda3
+swapon /dev/sda3
@end example
Alternatively, you may use a swap file. For example, assuming that in