diff options
author | Aneesh Agrawal <aneeshusa@gmail.com> | 2015-10-21 17:37:14 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-02-06 19:48:30 +0000 |
commit | 3c5fca9618241334f40bfd2199cdfabb4fad55ec (patch) | |
tree | cfcf6aae28bfcd93df11019c9486255ffb440e31 /nixos/tests | |
parent | f7aa92177355dc94d7e554cb6b089eb81cb320fa (diff) | |
download | nixlib-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar nixlib-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.gz nixlib-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.bz2 nixlib-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.lz nixlib-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.xz nixlib-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.zst nixlib-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/tests')
-rw-r--r-- | nixos/tests/misc.nix | 2 | ||||
-rw-r--r-- | nixos/tests/nfs.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 6297452df95e..73af0cfad21f 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : { systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; fileSystems = mkVMOverride { "/tmp2" = { fsType = "tmpfs"; - options = "mode=1777,noauto"; + options = [ "mode=1777" "noauto" ]; }; }; systemd.automounts = singleton diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 24f6e0f2ed95..36cd6a395779 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -8,7 +8,7 @@ let [ { mountPoint = "/data"; device = "server:/data"; fsType = "nfs"; - options = "vers=${toString version}"; + options = [ "vers=${toString version}" ]; } ]; networking.firewall.enable = false; # FIXME: only open statd |