diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2022-04-03 16:17:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-03 16:17:48 +0000 |
| commit | aafec3d77898b1bff5b1e6434e6e2f8fca17a5e7 (patch) | |
| tree | 7a547f03e02982a6ad3777cea891e1380436425b /nixos | |
| parent | 23bcd51fd544509296b8d43b47982481ffc2fd04 (diff) | |
| parent | 01512653115d6ee90d20682739b1ccf617c95391 (diff) | |
Merge pull request #166154 from YoshiRulz/yoshi-manual
Manual: move note re: `useOSProber` option under GRUB subheading
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/from_md/installation/installing.chapter.xml | 14 | ||||
| -rw-r--r-- | nixos/doc/manual/installation/installing.chapter.md | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/nixos/doc/manual/from_md/installation/installing.chapter.xml b/nixos/doc/manual/from_md/installation/installing.chapter.xml index db073fa839653..aee0b30a70768 100644 --- a/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ b/nixos/doc/manual/from_md/installation/installing.chapter.xml @@ -411,6 +411,13 @@ OK specify on which disk the GRUB boot loader is to be installed. Without it, NixOS cannot boot. </para> + <para> + If there are other operating systems running on the + machine before installing NixOS, the + <xref linkend="opt-boot.loader.grub.useOSProber" /> + option can be set to <literal>true</literal> to + automatically add them to the grub menu. + </para> </listitem> </varlistentry> <varlistentry> @@ -437,13 +444,6 @@ OK </varlistentry> </variablelist> <para> - If there are other operating systems running on the machine - before installing NixOS, the - <xref linkend="opt-boot.loader.grub.useOSProber" /> option can - be set to <literal>true</literal> to automatically add them to - the grub menu. - </para> - <para> If you need to configure networking for your machine the configuration options are described in <xref linkend="sec-networking" />. In particular, while wifi diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index def4f37fbcaa4..8a46d68ae3ba9 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -296,6 +296,11 @@ Use the following commands: specify on which disk the GRUB boot loader is to be installed. Without it, NixOS cannot boot. + : If there are other operating systems running on the machine before + installing NixOS, the [](#opt-boot.loader.grub.useOSProber) + option can be set to `true` to automatically add them to the grub + menu. + UEFI systems : You *must* set the option [](#opt-boot.loader.systemd-boot.enable) @@ -307,11 +312,6 @@ Use the following commands: [`boot.loader.systemd-boot`](#opt-boot.loader.systemd-boot.enable) as well. - If there are other operating systems running on the machine before - installing NixOS, the [](#opt-boot.loader.grub.useOSProber) - option can be set to `true` to automatically add them to the grub - menu. - 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 |