ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-20 20:20:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #166154 from YoshiRulz/yoshi-manual

Browse Source 
Manual: move note re: `useOSProber` option under GRUB subheading
This commit is contained in:
Guillaume Girol 2022-04-03 16:17:48 +00:00 committed by GitHub
commit aafec3d778
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/doc/manual/from_md/installation/installing.chapter.xml
View File

@ -411,6 +411,13 @@ OK
specify on which disk the GRUB boot loader is to be specify on which disk the GRUB boot loader is to be
installed. Without it, NixOS cannot boot. installed. Without it, NixOS cannot boot.
</para> </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> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -436,13 +443,6 @@ OK
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </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> <para>
If you need to configure networking for your machine the If you need to configure networking for your machine the
configuration options are described in configuration options are described in

10
nixos/doc/manual/installation/installing.chapter.md
View File

@ -296,6 +296,11 @@ Use the following commands:
specify on which disk the GRUB boot loader is to be installed. specify on which disk the GRUB boot loader is to be installed.
Without it, NixOS cannot boot. 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 UEFI systems
: You *must* set the option [](#opt-boot.loader.systemd-boot.enable) : 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) [`boot.loader.systemd-boot`](#opt-boot.loader.systemd-boot.enable)
as well. 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 If you need to configure networking for your machine the
configuration options are described in [](#sec-networking). In configuration options are described in [](#sec-networking). In
particular, while wifi is supported on the installation image, it is particular, while wifi is supported on the installation image, it is