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/modules/installer | |
| 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/modules/installer')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 248b0f00283c..5702e2d9a1e5 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -249,7 +249,7 @@ in fileSystems."/" = { fsType = "tmpfs"; - options = "mode=0755"; + options = [ "mode=0755" ]; }; # Note that /dev/root is a symlink to the actual root device @@ -266,20 +266,20 @@ in fileSystems."/nix/.ro-store" = { fsType = "squashfs"; device = "/iso/nix-store.squashfs"; - options = "loop"; + options = [ "loop" ]; neededForBoot = true; }; fileSystems."/nix/.rw-store" = { fsType = "tmpfs"; - options = "mode=0755"; + options = [ "mode=0755" ]; neededForBoot = true; }; fileSystems."/nix/store" = { fsType = "unionfs-fuse"; device = "unionfs"; - options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro"; + options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ]; }; boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ]; diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 2284eba07a2d..ec880e084726 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -349,7 +349,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { fileSystems.\"$mountPoint\" = { device = \"$base$path\"; fsType = \"none\"; - options = \"bind\"; + options = \[ \"bind\" \]; }; EOF @@ -409,7 +409,7 @@ EOF if (scalar @extraOptions > 0) { $fileSystems .= <<EOF; - options = \"${\join ",", uniq(@extraOptions)}\"; + options = \[ ${\join " ", map { "\"" . $_ . "\"" } uniq(@extraOptions)} \]; EOF } |