diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-30 00:02:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-30 00:02:12 +0000 |
| commit | 6ed636d15c3763b0fec613db4aaa9eddd5ddd0b4 (patch) | |
| tree | 8a57ac0a31b71ba1fafd0369c9e0826a71ff96d9 /nixos | |
| parent | 50de8aa60e3a8768af4e31e810be456b82d89a44 (diff) | |
| parent | d2f9abdcc04bd5e0ef5e2dbb6bad2c3fbe657c3c (diff) | |
| download | nixpkgs-6ed636d15c3763b0fec613db4aaa9eddd5ddd0b4.tar nixpkgs-6ed636d15c3763b0fec613db4aaa9eddd5ddd0b4.tar.gz nixpkgs-6ed636d15c3763b0fec613db4aaa9eddd5ddd0b4.tar.bz2 nixpkgs-6ed636d15c3763b0fec613db4aaa9eddd5ddd0b4.tar.lz nixpkgs-6ed636d15c3763b0fec613db4aaa9eddd5ddd0b4.tar.xz nixpkgs-6ed636d15c3763b0fec613db4aaa9eddd5ddd0b4.tar.zst nixpkgs-6ed636d15c3763b0fec613db4aaa9eddd5ddd0b4.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/from_md/installation/installing.chapter.xml | 21 | ||||
| -rw-r--r-- | nixos/doc/manual/installation/installing.chapter.md | 12 |
2 files changed, 31 insertions, 2 deletions
diff --git a/nixos/doc/manual/from_md/installation/installing.chapter.xml b/nixos/doc/manual/from_md/installation/installing.chapter.xml index 19ff841f5a6..0fcbcf2e66c 100644 --- a/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ b/nixos/doc/manual/from_md/installation/installing.chapter.xml @@ -426,7 +426,9 @@ OK </term> <listitem> <para> - You <emphasis>must</emphasis> set the option + You must select a boot-loader, either system-boot or + GRUB. The recommended option is systemd-boot: set the + option <xref linkend="opt-boot.loader.systemd-boot.enable" /> to <literal>true</literal>. <literal>nixos-generate-config</literal> should do this @@ -440,6 +442,23 @@ OK <link linkend="opt-boot.loader.systemd-boot.enable"><literal>boot.loader.systemd-boot</literal></link> as well. </para> + <para> + If you want to use GRUB, set + <xref linkend="opt-boot.loader.grub.device" /> to + <literal>nodev</literal> and + <xref linkend="opt-boot.loader.grub.efiSupport" /> to + <literal>true</literal>. + </para> + <para> + With system-boot, you should not need any special + configuration to detect other installed systems. With + GRUB, set + <xref linkend="opt-boot.loader.grub.useOSProber" /> to + <literal>true</literal>, but this will only detect + windows partitions, not other linux distributions. If + you dual boot another linux distribution, use + system-boot instead. + </para> </listitem> </varlistentry> </variablelist> diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index 7e830f8e458..dd7f883bb3c 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -303,7 +303,8 @@ Use the following commands: UEFI systems - : You *must* set the option [](#opt-boot.loader.systemd-boot.enable) + : You must select a boot-loader, either system-boot or GRUB. The recommended + option is systemd-boot: set the option [](#opt-boot.loader.systemd-boot.enable) to `true`. `nixos-generate-config` should do this automatically for new configurations when booted in UEFI mode. @@ -312,6 +313,15 @@ Use the following commands: [`boot.loader.systemd-boot`](#opt-boot.loader.systemd-boot.enable) as well. + : If you want to use GRUB, set [](#opt-boot.loader.grub.device) to `nodev` and + [](#opt-boot.loader.grub.efiSupport) to `true`. + + : With system-boot, you should not need any special configuration to detect + other installed systems. With GRUB, set [](#opt-boot.loader.grub.useOSProber) + to `true`, but this will only detect windows partitions, not other linux + distributions. If you dual boot another linux distribution, use system-boot + instead. + If you need to configure networking for your machine the configuration options are described in [](#sec-networking). In particular, while wifi is supported on the installation image, it is |