diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml index 5bcef8605ae..4d1ad549f0f 100644 --- a/doc/manual/configuration.xml +++ b/doc/manual/configuration.xml @@ -394,11 +394,11 @@ groups can be managed using groupadd, -
Filesystems +
File systems -You can define filesystems using the +You can define file systems using the configuration option. For instance, the -following definition causes NixOS to mount the Ext4 filesystem on +following definition causes NixOS to mount the Ext4 file system on device /dev/disk/by-label/data onto the mount point /data: @@ -416,20 +416,20 @@ device aliases in /dev/disk/by-label and topology changes (e.g. if a disk is moved to another IDE controller). -You can usually omit the filesystem type +You can usually omit the file system type (), since mount can usually detect the type and load the necessary kernel module automatically. -However, if the filesystem is needed at early boot (in the initial +However, if the file system is needed at early boot (in the initial ramdisk) and is not ext2, ext3 or ext4, then it’s best to specify to ensure that the kernel module is available. -
LUKS-encrypted filesystems +
LUKS-encrypted file systems -NixOS supports filesystems that are encrypted using +NixOS supports file systems that are encrypted using LUKS (Linux Unified Key Setup). For example, -here is how you create an encrypted Ext4 filesystem on the device +here is how you create an encrypted Ext4 file system on the device /dev/sda2: @@ -449,7 +449,7 @@ Enter passphrase for /dev/sda2: *** $ mkfs.ext4 /dev/mapper/crypted -To ensure that this filesystem is automatically mounted at boot time +To ensure that this file system is automatically mounted at boot time as /, add the following to configuration.nix: diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml index 0ed9f22ef99..e43dafd3cfe 100644 --- a/doc/manual/man-nixos-rebuild.xml +++ b/doc/manual/man-nixos-rebuild.xml @@ -133,22 +133,21 @@ $ ./result/bin/run-*-vm kvm-intel or kvm-amd kernel modules to get hardware virtualisation. - The VM mounts the Nix store of the host through the CIFS - filesystem. (qemu-kvm automatically starts a - Samba daemon for this purpose.) The host Nix store is - read-only, so Nix commands that modify the Nix store will not - work in the VM. This includes commands such as - nixos-rebuild; to change the VM’s - configuration, you must halt the VM and re-run the commands - above. + The VM mounts the Nix store of the host through the 9P + file system. The host Nix store is read-only, so Nix commands + that modify the Nix store will not work in the VM. This + includes commands such as nixos-rebuild; to + change the VM’s configuration, you must halt the VM and re-run + the commands above. - The VM has its own ext3 root - filesystem, which is automatically created when the VM is first + The VM has its own ext3 root file + system, which is automatically created when the VM is first started, and is persistent across reboots of the VM. It is - stored in ./hostname.qcow2. - + stored in + ./hostname.qcow2. + diff --git a/doc/manual/running.xml b/doc/manual/running.xml index 5799aeec5d0..27b9556c8d9 100644 --- a/doc/manual/running.xml +++ b/doc/manual/running.xml @@ -23,7 +23,7 @@ instance, one unit can require that another unit must be successfully started before the first unit can be started. When the system boots, it starts a unit named default.target; the dependencies of this unit cause all system services to be started, -filesystems to be mounted, swap files to be activated, and so +file systems to be mounted, swap files to be activated, and so on. The command systemctl is the main way to