diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-22 12:26:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-22 12:26:55 +0000 |
| commit | feda7be3757134aa258c2b6400b8137bc5d3e347 (patch) | |
| tree | 1db20b33919d4e73e9d8f42e6cf901f590e86cc4 /nixos/doc/manual | |
| parent | e82d74132cd65d2c8aa0f1714fed0fcc39238f89 (diff) | |
| parent | f2b936edf58e999637927994244d3cad5aef84d9 (diff) | |
| download | nixlib-feda7be3757134aa258c2b6400b8137bc5d3e347.tar nixlib-feda7be3757134aa258c2b6400b8137bc5d3e347.tar.gz nixlib-feda7be3757134aa258c2b6400b8137bc5d3e347.tar.bz2 nixlib-feda7be3757134aa258c2b6400b8137bc5d3e347.tar.lz nixlib-feda7be3757134aa258c2b6400b8137bc5d3e347.tar.xz nixlib-feda7be3757134aa258c2b6400b8137bc5d3e347.tar.zst nixlib-feda7be3757134aa258c2b6400b8137bc5d3e347.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual')
| -rw-r--r-- | nixos/doc/manual/configuration/luks-file-systems.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index 405a50a9e430..d8654d71ac00 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -26,7 +26,11 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** <prompt># </prompt>mkfs.ext4 /dev/mapper/<replaceable>crypted</replaceable> </screen> - To ensure that this file system is automatically mounted at boot time as + The LUKS volume should be automatically picked up by + <command>nixos-generate-config</command>, but you might want to verify that your + <filename>hardware-configuration.nix</filename> looks correct. + + To manually ensure that the system is automatically mounted at boot time as <filename>/</filename>, add the following to <filename>configuration.nix</filename>: <programlisting> |