about summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorChristian Svensson <blue@cmd.nu>2020-09-03 23:07:50 +0200
committerChristian Svensson <blue@cmd.nu>2020-09-04 00:00:15 +0200
commit44e472a60537a67486085d1b68a26e69d0f29f20 (patch)
tree4f5ca54e16eb5301956c88f65d78c683d0e9c8d1 /nixos/doc/manual
parentcc0ad3f56ee3885cdaf1969546f1a18a201da2c9 (diff)
downloadnixlib-44e472a60537a67486085d1b68a26e69d0f29f20.tar
nixlib-44e472a60537a67486085d1b68a26e69d0f29f20.tar.gz
nixlib-44e472a60537a67486085d1b68a26e69d0f29f20.tar.bz2
nixlib-44e472a60537a67486085d1b68a26e69d0f29f20.tar.lz
nixlib-44e472a60537a67486085d1b68a26e69d0f29f20.tar.xz
nixlib-44e472a60537a67486085d1b68a26e69d0f29f20.tar.zst
nixlib-44e472a60537a67486085d1b68a26e69d0f29f20.zip
nixos/manual: luks entries are auto-detected
Mention that the the LUKS entries do not need to be added when using
nixos-generate-config. Keep the instructions for people that want to
do it manually.
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/configuration/luks-file-systems.xml6
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 8a8168c095f0..5a356595c116 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: ***
 
 # mkfs.ext4 /dev/mapper/crypted
 </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>