summary refs log tree commit diff
path: root/nixos/doc/manual/configuration
diff options
context:
space:
mode:
authorAneesh Agrawal <aneeshusa@gmail.com>2015-10-21 17:37:14 +0000
committerRobin Gloster <mail@glob.in>2016-02-06 19:48:30 +0000
commit3c5fca9618241334f40bfd2199cdfabb4fad55ec (patch)
treecfcf6aae28bfcd93df11019c9486255ffb440e31 /nixos/doc/manual/configuration
parentf7aa92177355dc94d7e554cb6b089eb81cb320fa (diff)
downloadnixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar
nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.gz
nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.bz2
nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.lz
nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.xz
nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.zst
nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.zip
filesystems: use list of strings for fs options
Allow usage of list of strings instead of a comma-separated string
for filesystem options. Deprecate the comma-separated string style
with a warning message; convert this to a hard error after 16.09.
15.09 was just released, so this provides a deprecation period during
the 16.03 release.

closes #10518

Signed-off-by: Robin Gloster <mail@glob.in>
Diffstat (limited to 'nixos/doc/manual/configuration')
-rw-r--r--nixos/doc/manual/configuration/config-file.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index b613c7f06cc..9b240979273 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -157,7 +157,7 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60;
 fileSystems."/boot" =
   { device = "/dev/sda1";
     fsType = "ext4";
-    options = "rw,data=ordered,relatime";
+    options = [ "rw" "data=ordered" "relatime" ];
   };
 </programlisting>
       </para>