diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-10-09 23:00:46 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-09 23:00:46 -0400 |
commit | c3c4a9249dc8e62492034326ad63ae740cb6e82f (patch) | |
tree | 57bd495acd9571b51361c58e3395b6aa4c1e0170 /nixos | |
parent | dd428b8f5f5a4790f16aa2377a38a72297ed3249 (diff) | |
parent | 467bec34bb24d59c1178247935d92ac3195bac78 (diff) | |
download | nixlib-c3c4a9249dc8e62492034326ad63ae740cb6e82f.tar nixlib-c3c4a9249dc8e62492034326ad63ae740cb6e82f.tar.gz nixlib-c3c4a9249dc8e62492034326ad63ae740cb6e82f.tar.bz2 nixlib-c3c4a9249dc8e62492034326ad63ae740cb6e82f.tar.lz nixlib-c3c4a9249dc8e62492034326ad63ae740cb6e82f.tar.xz nixlib-c3c4a9249dc8e62492034326ad63ae740cb6e82f.tar.zst nixlib-c3c4a9249dc8e62492034326ad63ae740cb6e82f.zip |
Merge pull request #48025 from samueldr/fix/actually-fix-partitioning-instructions
nixos/doc: Actually fix partitioning instructions.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/installation/installing.xml | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 2b68def95b70..8e94f946c5ee 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -115,10 +115,17 @@ </listitem> <listitem> <para> - Add a <emphasis>swap</emphasis> partition. The size required will vary - according to needs, here a 8GiB one is created. The space left in front - (512MiB) will be used by the boot partition. -<screen language="commands"># parted /dev/sda -- mkpart primary linux-swap 512MiB 8.5GiB</screen> + Add the <emphasis>root</emphasis> partition. This will fill the disk + except for the end part, where the swap will live, and the space left in + front (512MiB) which will be used by the boot partition. +<screen language="commands"># parted /dev/sda -- mkpart primary 512MiB -8GiB</screen> + </para> + </listitem> + <listitem> + <para> + Next, add a <emphasis>swap</emphasis> partition. The size required will + vary according to needs, here a 8GiB one is created. +<screen language="commands"># parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen> <note> <para> The swap partition size rules are no different than for other Linux @@ -129,18 +136,11 @@ </listitem> <listitem> <para> - Next, add the <emphasis>root</emphasis> partition. This will fill the - remainder ending part of the disk. -<screen language="commands"># parted /dev/sda -- mkpart primary 8.5GiB -1MiB</screen> - </para> - </listitem> - <listitem> - <para> Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses the ESP (EFI system partition) as its <emphasis>/boot</emphasis> partition. It uses the initially reserved 512MiB at the start of the disk. -<screen language="commands"># parted /dev/sda -- mkpart ESP fat32 1M 512MiB +<screen language="commands"># parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB # parted /dev/sda -- set 3 boot on</screen> </para> </listitem> @@ -177,9 +177,16 @@ </listitem> <listitem> <para> - Add a <emphasis>swap</emphasis> partition. The size required will vary - according to needs, here a 8GiB one is created. -<screen language="commands"># parted /dev/sda -- mkpart primary linux-swap 1M 8GiB</screen> + Add the <emphasis>root</emphasis> partition. This will fill the the disk + except for the end part, where the swap will live. +<screen language="commands"># parted /dev/sda -- mkpart primary 1MiB -8GiB</screen> + </para> + </listitem> + <listitem> + <para> + Finally, add a <emphasis>swap</emphasis> partition. The size required + will vary according to needs, here a 8GiB one is created. +<screen language="commands"># parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen> <note> <para> The swap partition size rules are no different than for other Linux @@ -188,13 +195,6 @@ </note> </para> </listitem> - <listitem> - <para> - Finally, add the <emphasis>root</emphasis> partition. This will fill the - remainder of the disk. -<screen language="commands"># parted /dev/sda -- mkpart primary 8GiB -1s</screen> - </para> - </listitem> </orderedlist> </para> @@ -486,17 +486,17 @@ $ nix-env -i w3m</screen> <title>Example partition schemes for NixOS on <filename>/dev/sda</filename> (MBR)</title> <screen language="commands"> # parted /dev/sda -- mklabel msdos -# parted /dev/sda -- mkpart primary linux-swap 1M 8GiB -# parted /dev/sda -- mkpart primary 8GiB -1s</screen> +# parted /dev/sda -- mkpart primary 1MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen> </example> <example xml:id="ex-partition-scheme-UEFI"> <title>Example partition schemes for NixOS on <filename>/dev/sda</filename> (UEFI)</title> <screen language="commands"> # parted /dev/sda -- mklabel gpt -# parted /dev/sda -- mkpart primary linux-swap 512MiB 8.5GiB -# parted /dev/sda -- mkpart primary 8.5GiB -1MiB -# parted /dev/sda -- mkpart ESP fat32 1M 512MiB +# parted /dev/sda -- mkpart primary 512MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB # parted /dev/sda -- set 3 boot on</screen> </example> |