diff options
| author | Graham Christensen <graham@grahamc.com> | 2018-04-30 21:30:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 21:30:20 -0400 |
| commit | d1165dba9979b6bd4ba063b7e39384ece33eec4e (patch) | |
| tree | 97ef14c099cb326ce0271de38f075ac3ed4df91a /nixos/doc/manual/installation/installing-from-other-distro.xml | |
| parent | 8cb0252b1e50a5236793e0fbf39b39510725ccf0 (diff) | |
| parent | 7292c5a5701bacc4188a00e0399a92aa748ec6a5 (diff) | |
| download | nixlib-d1165dba9979b6bd4ba063b7e39384ece33eec4e.tar nixlib-d1165dba9979b6bd4ba063b7e39384ece33eec4e.tar.gz nixlib-d1165dba9979b6bd4ba063b7e39384ece33eec4e.tar.bz2 nixlib-d1165dba9979b6bd4ba063b7e39384ece33eec4e.tar.lz nixlib-d1165dba9979b6bd4ba063b7e39384ece33eec4e.tar.xz nixlib-d1165dba9979b6bd4ba063b7e39384ece33eec4e.tar.zst nixlib-d1165dba9979b6bd4ba063b7e39384ece33eec4e.zip | |
Merge pull request #38831 from rdnetto/improve-cross-refs
Improve cross referencing in NixOS Manual
Diffstat (limited to 'nixos/doc/manual/installation/installing-from-other-distro.xml')
| -rw-r--r-- | nixos/doc/manual/installation/installing-from-other-distro.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index ecd020a067a9..7e6ddb05cd66 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -111,7 +111,7 @@ $ nix-channel --add https://nixos.org/channels/nixos-<replaceable>version</repla <literal>configuration.nix</literal>:</para> <programlisting> -boot.loader.grub.extraEntries = '' +<xref linkend="opt-boot.loader.grub.extraEntries"/> = '' menuentry "Ubuntu" { search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e configfile "($ubuntu)/boot/grub/grub.cfg" @@ -183,7 +183,9 @@ $ sudo groupdel nixbld</screen> account with <literal>sudo passwd -l root</literal> if you use <literal>sudo</literal>)</para> - <programlisting>users.extraUsers.root.initialHashedPassword = "";</programlisting> + <programlisting> +<link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.root.initialHashedPassword</link> = ""; + </programlisting> </listitem> <listitem> @@ -243,13 +245,15 @@ $ sudo groupdel nixbld</screen> <screen> $ sudo touch /etc/NIXOS -$ sudo touch /etc/NIXOS_LUSTRATE</screen> +$ sudo touch /etc/NIXOS_LUSTRATE + </screen> <para>Let's also make sure the NixOS configuration files are kept once we reboot on NixOS:</para> <screen> -$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE</screen> +$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + </screen> </listitem> <listitem> |